widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,090 Commits 2 Branches 0 Tags
7b0fe07c8af594cdcec397b0bafbe87484ef8e1e
Commit Graph

4090 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rahul Frias
7b0fe07c8a Merge changes I295f66f9,I142f286c into rvc-dev am: 05fbb3dd87 am: 0db9b974c2 am: 1c6633d408 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11620164

Change-Id: I48c5b7cc50c94e78b9aa9f65748d5fa51fc949ea
 2020-06-16 09:12:57 +00:00
Rahul Frias
1c6633d408 Merge changes I295f66f9,I142f286c into rvc-dev am: 05fbb3dd87 am: 0db9b974c2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11620164

Change-Id: I31070cfbc0f7f8742fea3dc5e25c1328df68de22
 2020-06-16 09:03:23 +00:00
Rahul Frias
0db9b974c2 Merge changes I295f66f9,I142f286c into rvc-dev am: 05fbb3dd87 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11620164

Change-Id: I59aa80b62824a29a8350b99a8f9a35d193aa968e
 2020-06-16 08:54:27 +00:00
Rahul Frias
05fbb3dd87 Merge changes I295f66f9,I142f286c into rvc-dev 
* changes:
  Add ATSC support - part 2
  Add ATSC support - part 1
 2020-06-16 08:46:02 +00:00
Automerger Merge Worker
70d0761ed6 Merge "Remove Android.mk for OEMCrypto ref code am: 119932ea69 am: 859038e6c8" into rvc-d1-dev-plus-aosp am: 9833b1e86d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11870737

Change-Id: I6851edd39289b33f5ab4d2b159f6d1ec8d8133a8
 2020-06-16 02:34:00 +00:00
Fred Gylys-Colwell
98187ae858 Remove Android.mk for OEMCrypto ref code am: 119932ea69 am: 859038e6c8 am: 8dafa15521 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11870737

Change-Id: I5ac8eae550901fac5734f582279ce73e96f98e75
 2020-06-16 02:33:48 +00:00
Fred Gylys-Colwell
6926815f29 Remove Android.mk for OEMCrypto ref code am: 119932ea69 am: d0259e0942 am: 8ff9d2255d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11870737

Change-Id: I9fb4b3beddb2cf7c649420ca3ae22d9c5124d85a
 2020-06-16 02:33:41 +00:00
Fred Gylys-Colwell
8dafa15521 Remove Android.mk for OEMCrypto ref code am: 119932ea69 am: 859038e6c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11870737

Change-Id: I0c42f412da1de1624577700887db1f6bd7ca937c
 2020-06-16 02:20:30 +00:00
Automerger Merge Worker
9833b1e86d Merge "Remove Android.mk for OEMCrypto ref code am: 119932ea69 am: 859038e6c8" into rvc-d1-dev-plus-aosp 2020-06-16 02:20:20 +00:00
Fred Gylys-Colwell
1ee911150a Remove Android.mk for OEMCrypto ref code am: 119932ea69 am: 859038e6c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11870737

Change-Id: I47571f3ab78d1e917f3361258b3c29ee1f4883c4
 2020-06-16 02:20:16 +00:00
Fred Gylys-Colwell
8ff9d2255d Remove Android.mk for OEMCrypto ref code am: 119932ea69 am: d0259e0942 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11870737

Change-Id: I90988810cb3a1e5443ca58fe65a9ddb775e6f326
 2020-06-16 02:20:15 +00:00
Fred Gylys-Colwell
859038e6c8 Remove Android.mk for OEMCrypto ref code am: 119932ea69 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11870737

Change-Id: Iab024d334ba53aacd6813a350749f6a31568d635
 2020-06-16 02:12:45 +00:00
Fred Gylys-Colwell
d0259e0942 Remove Android.mk for OEMCrypto ref code am: 119932ea69 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11870737

Change-Id: I3eba5d14aa17dc70888964154b11e70ff7e6bdbc
 2020-06-16 02:12:30 +00:00
Fred Gylys-Colwell
119932ea69 Remove Android.mk for OEMCrypto ref code 
Merge from Widevine repo of http://go/wvgerrit/101905

The reference OEMCrypto should not be built as part of Android.

Test: Builds
Bug: 146361995
Change-Id: Ic25e6e567fcac519636f64dabc0d59b3df78990e
 2020-06-15 17:40:28 -07:00
Dan Willemsen
927ef46152 Replace libcrypto_static with libcrypto am: 761d1723ff am: abf67e2910 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11815604

Change-Id: Ie3a6d8648842d1a1f6cd0dfcf70927b7cedf7b57
 2020-06-15 20:10:51 +00:00
Dan Willemsen
abf67e2910 Replace libcrypto_static with libcrypto am: 761d1723ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11815604

Change-Id: If659bab9de0b6878e21035aac6b99c4d4bf83e15
 2020-06-15 20:00:10 +00:00
Rahul Frias
8da1145012 Add ATSC support - part 2 
[ Merge of http://go/wvgerrit/100905 and http://go/ag/10708438 ]

Add support for ATSC certificate and licenses handling. ATSC
files are distinguished from the apps DRM certificate and licenses
by file naming conventions.

Bug: 139730600
Test: WV unit/integration test, GtsMediaTestCases
Change-Id: I295f66f92fe01d7716978deac9dc360d74addedd
 2020-06-12 03:48:58 -07:00
Dan Willemsen
761d1723ff Replace libcrypto_static with libcrypto 
libcrypto_static has restricted visibility, which is now being
implemented in Make, so we either need to allow it for all vendor
modules, or use the shared library instead.

Bug: 158599308
Test: treehugger
Test: mmma vendor/widevine/libwvdrmengine
Change-Id: I88ddce7ad221c66a20f4e05409ae77421e4196ad
 2020-06-10 00:10:06 +00:00
Rahul Frias
bbe9f6afc4 Add ATSC support - part 1 
[ Merge of http://go/wvgerrit/100864 and http://go/ag/10704773 ]

ATSC 3.0 allows for licenses to be downloaded OTA and are tied to
a DRM certificate that may be shared across apps. The provisioning
process for ATSC may happen at the factory or during an OS update.

This contrasts from the regular OTT model, which requires that
provisioning and license download have an uplink as well as a
downlink connection.

This adds support for the ATSC mode property. ATSC mode can only be
set (or unset) before sessions are opened. Once the CDM identifier is
set/sealed, requests to modify the ATSC mode will be rejected.

If one needs to open sessions with both ATSC mode and regular (non-ATSC)
mode, separate MediaDrm objects will need to be created. The default
mode is to not use ATSC.

Enable ATSC mode by calling
  mediaDrm.setPropertyString("atscMode", "enable")

Disable ATSC mode by calling
  mediaDrm.setPropertyString("atscMode", "disable")

Provisioning and unprovisioning requests for ATSC will be rejected as
certificates will be retrieved by the ATSC service.

Bug: 139730600
Test: WV unit/integration test, GtsMediaTestCases
Change-Id: I142f286c711fe007ff42125c3c8cdc6450b6ea36
 2020-06-08 14:56:48 -07:00
Automerger Merge Worker
4301ca6365 Merge "Update OEMCrypto documentation to v16.3 am: aa5fc5afd0 am: d974c03dd1" into rvc-d1-dev-plus-aosp am: b8d8bdbf38 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11707216

Change-Id: I781d687b35ebf6c7c7749e9ae3cb1ffdba49eba0
 2020-06-04 22:14:14 +00:00
Automerger Merge Worker
b646ad1d07 Merge "Update OEMCrypto documentation to v16.3 am: aa5fc5afd0 am: 30ea7ee843 am: a4b30d900e" into rvc-qpr-dev-plus-aosp 2020-06-04 22:14:06 +00:00
Fred Gylys-Colwell
4c44aa5f7e Update OEMCrypto documentation to v16.3 am: aa5fc5afd0 am: 30ea7ee843 am: a4b30d900e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11707216

Change-Id: I8132d7c40c9131c062efcf40800fb01708b6ad6b
 2020-06-04 22:14:03 +00:00
Fred Gylys-Colwell
cc446c0075 Update OEMCrypto documentation to v16.3 am: aa5fc5afd0 am: 30ea7ee843 am: 615bf191a5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11707216

Change-Id: I503c075fcff317f2563443d22565a821e0291e98
 2020-06-04 22:13:58 +00:00
Automerger Merge Worker
b8d8bdbf38 Merge "Update OEMCrypto documentation to v16.3 am: aa5fc5afd0 am: d974c03dd1" into rvc-d1-dev-plus-aosp 2020-06-04 22:00:34 +00:00
Fred Gylys-Colwell
798ceec5d6 Update OEMCrypto documentation to v16.3 am: aa5fc5afd0 am: d974c03dd1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11707216

Change-Id: I8fda483d3c35d05b89979937845887a8d65af851
 2020-06-04 22:00:31 +00:00
Fred Gylys-Colwell
615bf191a5 Update OEMCrypto documentation to v16.3 am: aa5fc5afd0 am: 30ea7ee843 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11707216

Change-Id: Ie1c3ac931db1c7f969d8e0a9e75a46b08b9ec02f
 2020-06-04 22:00:28 +00:00
Fred Gylys-Colwell
a4b30d900e Update OEMCrypto documentation to v16.3 am: aa5fc5afd0 am: 30ea7ee843 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11707216

Change-Id: Ie80d8d3aa4f0825ac68065ab38eeaba46169ca29
 2020-06-04 22:00:27 +00:00
Fred Gylys-Colwell
d974c03dd1 Update OEMCrypto documentation to v16.3 am: aa5fc5afd0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11707216

Change-Id: Ic40d39691e70d6ad30d9061ee510f0c38c6c4b02
 2020-06-04 21:34:15 +00:00
Fred Gylys-Colwell
30ea7ee843 Update OEMCrypto documentation to v16.3 am: aa5fc5afd0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11707216

Change-Id: Ie462379eedd98d16a3ac33d9184147baf7a47988
 2020-06-04 21:34:08 +00:00
Fred Gylys-Colwell
aa5fc5afd0 Update OEMCrypto documentation to v16.3 
Merge from Widevine repo of http://go/wvgerrit/101243

Changed the version number to 16.3 and the date to June 1st.  The
delta document has a short description of CL's added since
April 6th.

Test: documentation changes only
Bug: 157030231
Change-Id: I93c2b09d6a24efc71ed77110b115cafbd6fde1c6
 2020-06-03 06:14:35 -07:00
Fred Gylys-Colwell
0e98719769 Update OEMCrypto unit tests to require ODK 16.3 am: 45681615b8 am: b831ee0237 am: ee6c56b6fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11677949

Change-Id: I912ebee2e201cb1ee78003647000623598b84742
 2020-06-02 22:16:41 +00:00
Fred Gylys-Colwell
0c02597e90 Do not verify decrypt hash when no key selected am: 36968de671 am: 9b8b71a9ba am: f3049a4c17 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11677948

Change-Id: Ief90864f581acbb9f9a664b6a877e7d338299675
 2020-06-02 22:16:40 +00:00
Fred Gylys-Colwell
f16ede2414 Unit test for loading nonce-free offline license am: a615671f48 am: e93082da54 am: 5d89bcbfa8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11677947

Change-Id: Ib0b6bb594b763c4f81bab64ce56b149e0366f333
 2020-06-02 22:16:38 +00:00
Fred Gylys-Colwell
072ccf2818 Check for null pointers in oemcrypto adapter am: 42eb79a3ff am: bc78188bb3 am: 54c6559f83 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11677946

Change-Id: I59eb0cc1b47b15508ee79b84aab05022eb16b088
 2020-06-02 22:16:37 +00:00
Fred Gylys-Colwell
c3fffc66c1 Update ODK Library to 16.3 am: 166b3e8403 am: 3b9be16415 am: 26d6f84917 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11699230

Change-Id: I4828d36869ece2766464d246bdd3f8a21b0ec112
 2020-06-02 22:16:35 +00:00
Fred Gylys-Colwell
b798bd3aa5 ODK: forward compatibility and nonce-free offline license support am: 8dc1d7a11d am: 3c027f9373 am: e4ba489225 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11688972

Change-Id: I6ed79ad3279fc857c9b7eaef307ec0e0bdd2c552
 2020-06-02 22:16:34 +00:00
Fred Gylys-Colwell
041d91b73d Update OEMCrypto unit tests to require ODK 16.3 am: 45681615b8 am: d599c74011 am: ed6f7c1347 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11677949

Change-Id: I76a515e64426bac9440006b9a0f5bb6083e4f6b3
 2020-06-02 22:16:19 +00:00
Fred Gylys-Colwell
3e037df811 Do not verify decrypt hash when no key selected am: 36968de671 am: 51992ab155 am: b72520df48 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11677948

Change-Id: I720c84377fdba96d739ca63c69db44d1e285030c
 2020-06-02 22:16:17 +00:00
Fred Gylys-Colwell
fbfc9c36b6 Unit test for loading nonce-free offline license am: a615671f48 am: ed900f242b am: 299d866412 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11677947

Change-Id: I3b73f6016acf34b6d533781162ada401aeff26ff
 2020-06-02 22:16:15 +00:00
Fred Gylys-Colwell
64e07f7c86 Check for null pointers in oemcrypto adapter am: 42eb79a3ff am: 7a4313483c am: 0f63c0191d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11677946

Change-Id: Ida7c333533270dd799f4bfa6f01ba6c61220e2df
 2020-06-02 22:16:13 +00:00
Fred Gylys-Colwell
b277fbee46 Update ODK Library to 16.3 am: 166b3e8403 am: 62802d8e10 am: 253eb191ea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11699230

Change-Id: I71144cf8722e315c1906eff2990f40436a592b80
 2020-06-02 22:16:10 +00:00
Fred Gylys-Colwell
721a4d8687 ODK: forward compatibility and nonce-free offline license support am: 8dc1d7a11d am: 5bb396fb72 am: d2830141cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11688972

Change-Id: I3a65e2403d79298205a70b3dd3917ec4c250bbf1
 2020-06-02 22:16:08 +00:00
Fred Gylys-Colwell
b4f072558e Update OEMCrypto unit tests to require ODK 16.3 am: 45681615b8 am: d599c74011 am: a12d082a11 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11677949

Change-Id: Idaae820ce74e6477db458f610a5cab73559c7913
 2020-06-02 22:15:50 +00:00
Fred Gylys-Colwell
d4f0d69923 Do not verify decrypt hash when no key selected am: 36968de671 am: 51992ab155 am: 23f9a69a7f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11677948

Change-Id: I8a8884b0139ca407050b5d399a069096b1d5b4d1
 2020-06-02 22:15:49 +00:00
Fred Gylys-Colwell
38d465b042 Unit test for loading nonce-free offline license am: a615671f48 am: ed900f242b am: 32b318e7c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11677947

Change-Id: Ibc6f16ff98c6b9e4162059093263e5359dac28dc
 2020-06-02 22:15:48 +00:00
Fred Gylys-Colwell
fcf75fec0d Check for null pointers in oemcrypto adapter am: 42eb79a3ff am: 7a4313483c am: 2643b76731 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11677946

Change-Id: I624aa93387d3765417494bd2387330e1b354993a
 2020-06-02 22:15:46 +00:00
Fred Gylys-Colwell
084bfcf938 Update ODK Library to 16.3 am: 166b3e8403 am: 62802d8e10 am: 4b9e91eefd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11699230

Change-Id: I8a8e8bd3b2dbb762f19e23cfa48169e37fcc4a81
 2020-06-02 22:15:45 +00:00
Fred Gylys-Colwell
0000eef77d ODK: forward compatibility and nonce-free offline license support am: 8dc1d7a11d am: 5bb396fb72 am: c2920550ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11688972

Change-Id: I9be37c5e5461cf2cd43eaac653d33f12aa895c09
 2020-06-02 22:15:43 +00:00
Fred Gylys-Colwell
ee6c56b6fd Update OEMCrypto unit tests to require ODK 16.3 am: 45681615b8 am: b831ee0237 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11677949

Change-Id: Iae74a721ce3056652e9b2081595ded2da2d70b3a
 2020-06-02 22:02:00 +00:00
Fred Gylys-Colwell
f3049a4c17 Do not verify decrypt hash when no key selected am: 36968de671 am: 9b8b71a9ba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11677948

Change-Id: I98251e8de8cf9e874e74215968c2b56cd197ecec
 2020-06-02 22:01:59 +00:00