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

4734 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
John Bruce
1f2f27a0e1 Merge "Add <algorithm> to device_files.cpp" am: b5a4b58ca4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11724901

Change-Id: Ifbca1a020216319d24c8ec21d8fc0e1508e2a449
 2020-06-05 21:10:19 +00:00
John Bruce
b5a4b58ca4 Merge "Add <algorithm> to device_files.cpp" 2020-06-05 20:50:44 +00:00
Automerger Merge Worker
792baa8163 Merge "Update OEMCrypto documentation to v16.3 am: aa5fc5afd0 am: d974c03dd1" into rvc-d1-dev-plus-aosp am: b8d8bdbf38 am: 4301ca6365 am: f66e378b88 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11707216

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

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

Change-Id: I3a1e8a4f83b6c8ff9bd5e79697d3357a63599006
 2020-06-04 22:44:14 +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
e40a29b635 Update OEMCrypto documentation to v16.3 am: aa5fc5afd0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11707216

Change-Id: I7abdc07e505afccc8b686e295c1d8d218cd13ea8
 2020-06-04 21:34: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
9565897f1c Update OEMCrypto unit tests to require ODK 16.3 am: 45681615b8 am: b831ee0237 am: ee6c56b6fd am: 0e98719769 am: f870da8567 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11677949

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Change-Id: I61f10308aecd264b833de36e9cf8e4f93828e883
 2020-06-02 22:47:42 +00: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