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

4436 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
John Bruce
b5a4b58ca4 Merge "Add <algorithm> to device_files.cpp" 2020-06-05 20:50:44 +00:00
Automerger Merge Worker
f66e378b88 Merge "Update OEMCrypto documentation to v16.3 am: aa5fc5afd0 am: d974c03dd1" into rvc-d1-dev-plus-aosp am: b8d8bdbf38 am: 4301ca6365 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11707216

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

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

Change-Id: I80833b2d971bdbe82af3ba709651d98ac8e29e5b
 2020-06-04 22:29:48 +00: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
John W. Bruce
e47233ecf6 Add <algorithm> to device_files.cpp 
(This is a merge of http://go/wvgerrit/101423 to Android.)

This header was missing. On the STL used inside Google, it gets included
transitively, but this is not guaranteed and broke in a partner's STL.

Bug: 154185251
Test: Android Build
Test: CE CDM Build and Unit Tests
Change-Id: If8df7e288073e69250f98d67f732804a955bbaa3
 2020-06-03 16:21:57 -07: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
f870da8567 Update OEMCrypto unit tests to require ODK 16.3 am: 45681615b8 am: b831ee0237 am: ee6c56b6fd am: 0e98719769 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11677949

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Change-Id: Ia701b9c7696d33a47f8d2a342cec3f5d79ca20db
 2020-06-02 22:26:44 +00: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