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

4838 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fred Gylys-Colwell
80667cbac3 Sign unused renewal so that offline renewal may be loaded 
Merge from Widevine repo of http://go/wvgerrit/105347

When reloading an offline license that has an offline renewal, we sign
a unused renewal so that the ODK library can update its clock values.

Test: WV unit/integration tests, GtsMediaTestCases tests
Bug: 166131956
Change-Id: Ib1445fd85222489f21221e00729d4989cb49a331
 2020-09-22 02:44:05 +00:00
Rahul Frias
0761dd8920 Avoid passing device ID when unused 
[ Merge of http://go/wvgerrit/105743 ]

Device ID is no longer reported directly in provisioning/license
request or used by ClientIdentification. It does not need to be passed
in during initialization.

Bug: 168085721
Test: WV unit/integration tests
Change-Id: I483eac963c3f40784e42e1a2b917fcc96aa76a05
 2020-09-17 23:35:15 -07:00
Fred Gylys-Colwell
20bb84ffee Merge recent doc changes for OEMCrypto 
This is a cherry pick of recent changes to OEMCrypto and ODK. Most of
these are part of the document migration to doxygen.

See http://go/wvgerrit/106005 and its parents for code reviews.

Bug: 144715340
Bug: 148232693
Bug: 167580674
Change-Id: I658f99c8117b974faed97322d61fac0f382283af
 2020-09-15 19:10:53 -07:00
Robert Shih
f26e2ef0f2 GetDecryptHashSupport: recognize OEMCrypto_ERROR_NOT_IMPLEMENTED am: da09f4abca am: 4bf604c2d7 am: 28b13ef65e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12036417

Change-Id: I80d00065c7fd504f5d0855351c79a84e0a6aa76e
 2020-09-15 02:39:33 +00:00
Alex Dale
9a2e83613a Merge "Test CDM sessions prevent multiple usage entries." into rvc-dev am: c628c5aca2 am: 7a65b6c2d4 am: 493bf5ec49 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11925460

Change-Id: I03cb03249f3f6a3dfdec750beb20e86dfa8333e1
 2020-09-15 02:25:15 +00:00
Robert Shih
28b13ef65e GetDecryptHashSupport: recognize OEMCrypto_ERROR_NOT_IMPLEMENTED am: da09f4abca am: 4bf604c2d7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12036417

Change-Id: Iaf89049a8a7a7828259968d534f87505c470021f
 2020-09-15 02:24:37 +00:00
Rahul Frias
48c449a138 Merge "Handle SPOID calculation for L3" into rvc-dev am: 25d1646138 am: 7a43e0f14b am: d79c4f2c0b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11736137

Change-Id: Ie0338089c15f04a9c6ce15cd86adf95c7e07a80e
 2020-09-15 02:15:15 +00:00
Alex Dale
493bf5ec49 Merge "Test CDM sessions prevent multiple usage entries." into rvc-dev am: c628c5aca2 am: 7a65b6c2d4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11925460

Change-Id: I7677699c1e9d0769447d091f366dae1dc9db08ba
 2020-09-15 02:14:41 +00:00
Rahul Frias
d79c4f2c0b Merge "Handle SPOID calculation for L3" into rvc-dev am: 25d1646138 am: 7a43e0f14b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11736137

Change-Id: Ib373332a453d704e20130f3ef88d45a750240219
 2020-09-15 02:10:04 +00:00
Edwin Wong
bfddf2ee37 Merge "Add v16 Widevine Integration Guide Android Supplement" into rvc-dev am: 6b8d0e034d am: 66a17f743d am: 138f690bf7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11838915

Change-Id: Id3e85976d2db1d00146cd5f56a36f034e832d29e
 2020-09-15 02:09:02 +00:00
Rahul Frias
0f322f9df3 Merge changes I295f66f9,I142f286c into rvc-dev am: 05fbb3dd87 am: 041132b76d am: f13fb91002 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11620164

Change-Id: Id4c4303bcba8bfb927cbd21e6c4a1766c59e8ed7
 2020-09-15 01:55:41 +00:00
Edwin Wong
138f690bf7 Merge "Add v16 Widevine Integration Guide Android Supplement" into rvc-dev am: 6b8d0e034d am: 66a17f743d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11838915

Change-Id: I10268df2825750f547accdf4d2ec40b22ff2a143
 2020-09-15 01:55:13 +00:00
Fred Gylys-Colwell
2dd6bc4a88 Remove Android.mk for OEMCrypto ref code am: 119932ea69 am: a8e2f398ad am: 37736b322a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11870737

Change-Id: I0a0a25f4a14946fdac2fb5e91880654f865341ec
 2020-09-15 01:43:28 +00:00
Rahul Frias
f13fb91002 Merge changes I295f66f9,I142f286c into rvc-dev am: 05fbb3dd87 am: 041132b76d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11620164

Change-Id: I71b07f7bcc11a57d86c4ab71a7ca27aa4207788a
 2020-09-15 01:42:19 +00:00
Fred Gylys-Colwell
4a53962138 Update OEMCrypto documentation to v16.3 am: aa5fc5afd0 am: e40a29b635 am: 4ac0ba742e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11707216

Change-Id: Ia4ec6d3f8cf877639e8550f662735709b7b57cbe
 2020-09-15 01:29:42 +00:00
Fred Gylys-Colwell
37736b322a Remove Android.mk for OEMCrypto ref code am: 119932ea69 am: a8e2f398ad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11870737

Change-Id: Ied1a03095d555b900bceeeb7fede1047ff82b34b
 2020-09-15 01:29:11 +00:00
Fred Gylys-Colwell
2170c5155c Update OEMCrypto unit tests to require ODK 16.3 am: 45681615b8 am: cd53dfca76 am: ebdecfbd68 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11677949

Change-Id: I404aa64b3a5a9318e1e2113a413c24ab9ff1b689
 2020-09-15 01:16:55 +00:00
Fred Gylys-Colwell
6d460881ad Do not verify decrypt hash when no key selected am: 36968de671 am: ea86db9a2a am: 9efaecdee2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11677948

Change-Id: I572eefdd9236aebed7b26c6b6c4026ea3a4e35cc
 2020-09-15 01:16:53 +00:00
Fred Gylys-Colwell
4b6d8ee166 Unit test for loading nonce-free offline license am: a615671f48 am: df9740ecda am: 9b222ef2c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11677947

Change-Id: I97ef2e70867ff80fe4bb43cdb5537f6f0339f563
 2020-09-15 01:16:52 +00:00
Fred Gylys-Colwell
7bed4bf687 Check for null pointers in oemcrypto adapter am: 42eb79a3ff am: 8ec81840f5 am: 3eb34674d2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11677946

Change-Id: I361e5882609b82cfeeb9f93d5843371ac1381fbf
 2020-09-15 01:16:51 +00:00
Fred Gylys-Colwell
a64625a553 Update ODK Library to 16.3 am: 166b3e8403 am: b33068bf35 am: 6d2b618296 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11699230

Change-Id: Ic7b18f8908ab9e3329214edfcce051347574591b
 2020-09-15 01:16:49 +00:00
Fred Gylys-Colwell
d7f28f92db ODK: forward compatibility and nonce-free offline license support am: 8dc1d7a11d am: 1bd515cc47 am: 922411f468 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11688972

Change-Id: I4ec118eb1ebc6ce5f387be7f4e87086def0e4f0f
 2020-09-15 01:16:48 +00:00
Fred Gylys-Colwell
4ac0ba742e Update OEMCrypto documentation to v16.3 am: aa5fc5afd0 am: e40a29b635 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11707216

Change-Id: Icb12136e8d6ed319c7c93f3d0c0fd11bd736127b
 2020-09-15 01:01:54 +00:00
Cong Lin
e20bd444bf Merge "Fix implicit type conversion issue in ODK" into rvc-dev am: c34e2af181 am: 5bac96c72c am: 272f490e32 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11661188

Change-Id: I21ef577c99f4475f58f017725ce54f2e2db09f39
 2020-09-15 01:01:34 +00:00
Fred Gylys-Colwell
ebdecfbd68 Update OEMCrypto unit tests to require ODK 16.3 am: 45681615b8 am: cd53dfca76 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11677949

Change-Id: I6e2696e359f7f1e69ce7c42748df92dea55098e2
 2020-09-15 00:52:01 +00:00
Fred Gylys-Colwell
9efaecdee2 Do not verify decrypt hash when no key selected am: 36968de671 am: ea86db9a2a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11677948

Change-Id: I58fcad399df8533bed5f267e53c998ea5c85a0ff
 2020-09-15 00:51:59 +00:00
Fred Gylys-Colwell
9b222ef2c5 Unit test for loading nonce-free offline license am: a615671f48 am: df9740ecda 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11677947

Change-Id: I35ff4ff4fc13982dac48a9547c14fb7e68ec57e4
 2020-09-15 00:51:58 +00:00
Fred Gylys-Colwell
3eb34674d2 Check for null pointers in oemcrypto adapter am: 42eb79a3ff am: 8ec81840f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11677946

Change-Id: I25696ace1bd30134fe17cdc54d1e6d0f8f7e0f20
 2020-09-15 00:51:56 +00:00
Fred Gylys-Colwell
6d2b618296 Update ODK Library to 16.3 am: 166b3e8403 am: b33068bf35 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11699230

Change-Id: I3b972e56a57f4bca0823300d783707c6e3c8e6e6
 2020-09-15 00:51:54 +00:00
Fred Gylys-Colwell
922411f468 ODK: forward compatibility and nonce-free offline license support am: 8dc1d7a11d am: 1bd515cc47 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11688972

Change-Id: I87f74e5c9dd6da3ca812a83a5fca5fcf01211e55
 2020-09-15 00:51:52 +00:00
Cong Lin
272f490e32 Merge "Fix implicit type conversion issue in ODK" into rvc-dev am: c34e2af181 am: 5bac96c72c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11661188

Change-Id: I4484ce8db14a75b74c232e235d5da44830bced45
 2020-09-15 00:37:30 +00:00
John Bruce
d749e66d2b Merge "OEMCrypto Unit Test Fix: Do Not Derive Keys Immediately" into rvc-dev am: 729723b3d2 am: 5ce6971993 am: 1f234b899f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11606170

Change-Id: I18bc34273d108c01f08c03ddf5323fec8d1cd61b
 2020-09-15 00:18:35 +00:00
John Bruce
1f234b899f Merge "OEMCrypto Unit Test Fix: Do Not Derive Keys Immediately" into rvc-dev am: 729723b3d2 am: 5ce6971993 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11606170

Change-Id: I89e61467d0aa55c31131e2415d4e87b6b70922af
 2020-09-14 23:42:00 +00:00
Alex Dale
5d13325c47 Rolled expected version number for R. am: dd70d63b76 am: 50e966a8d0 am: a806eec2dd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11530830

Change-Id: I8757e6c402ebf3d51fafb2b1258d7e9417e864e0
 2020-09-14 23:26:55 +00:00
Alex Dale
a806eec2dd Rolled expected version number for R. am: dd70d63b76 am: 50e966a8d0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11530830

Change-Id: I309f6bc9263c5f2a4353b00ea5869b3752d02574
 2020-09-14 23:18:45 +00:00
TreeHugger Robot
33f954893a Merge "The Entitlement key map was not being cleaned up." into rvc-dev am: bd8e573e0c am: 5d92fea3cd am: 5c796ea5b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11546312

Change-Id: I140b73792edaae9cb90e6be149e4f94916120c67
 2020-09-14 23:12:43 +00:00
TreeHugger Robot
5c796ea5b7 Merge "The Entitlement key map was not being cleaned up." into rvc-dev am: bd8e573e0c am: 5d92fea3cd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11546312

Change-Id: Ib71713ec896c58fa8009ea05cc6904b8c3c8792f
 2020-09-14 22:14:01 +00:00
TreeHugger Robot
b59e9aae01 Merge "Start playback timer in integration tests" into rvc-dev am: 7534d9795b am: 63a473d645 am: 0a5ec97f2f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11520639

Change-Id: I4fcb641e4ca53b4e465ae6d32db9e3a3c07a753a
 2020-09-14 11:39:31 +00:00
Fred Gylys-Colwell
6fe4cad9b8 Update TimeRollbackPrevention unit test am: 75575418d0 am: 86c4cc8dcd am: fb0c6e0e7c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11506307

Change-Id: I85e9816a55143cd45ee84b5e0812a8971787881f
 2020-09-14 11:21:26 +00:00
Fred Gylys-Colwell
a0451b013d License release does not use core message am: 760bf71908 am: a59c349816 am: 459ebef588 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11443770

Change-Id: I31dc1ceb80c951054c3eda81463fd7414384aa01
 2020-09-14 03:38:13 +00:00
TreeHugger Robot
0a5ec97f2f Merge "Start playback timer in integration tests" into rvc-dev am: 7534d9795b am: 63a473d645 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11520639

Change-Id: Ie51f3119431e844e9c205181449033d8b7890041
 2020-09-13 14:15:04 +00:00
Fred Gylys-Colwell
fb0c6e0e7c Update TimeRollbackPrevention unit test am: 75575418d0 am: 86c4cc8dcd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11506307

Change-Id: I1def8aca779a0541ddb23a6cbe4f30fceb7559be
 2020-09-13 13:42:56 +00:00
Fred Gylys-Colwell
459ebef588 License release does not use core message am: 760bf71908 am: a59c349816 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11443770

Change-Id: Ic536befe7a758be03ee2e997c2ea3a7eed892127
 2020-09-13 13:12:06 +00:00
Edwin Wong
c705534a3f Rename metrics.proto to wv_metrics.proto. am: 051e879438 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12553272

Change-Id: I388f71c46a6808c63046bcc0006b8cb130a05b4a
 2020-09-11 22:04:00 +00:00
Edwin Wong
051e879438 Rename metrics.proto to wv_metrics.proto. 
Merge from http://go/wvgerrit/105767

To avoid conflict with metrics.proto in
frameworks/av/drm/libmediadrm/proto.
This is in preparation of moving metrics_dump tool
to build under Android.

bug: 161783052
Test: unit test
Test: Play Movies & Tv and Netflix streaming
Change-Id: I2406b66db4d61cca7c6260ea8847a555d96c8d42
 2020-09-10 12:26:28 -07:00
Alex Dale
202a6fbb1b Merge "Enabled log formatting warnings." am: 7686e28e15 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12427377

Change-Id: I499b07d0c1d1984ac3f18526231326e48c9db0a8
 2020-09-09 04:26:15 +00:00
Alex Dale
7686e28e15 Merge "Enabled log formatting warnings." 2020-09-09 04:13:02 +00:00
Alex Dale
9c9404f22d Merge "Correctly handle local display only for SRM version." am: 1defd1c7fc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12482976

Change-Id: I6f13487f5443da1c0f70393344300732ffe9e961
 2020-09-09 03:57:11 +00:00
Alex Dale
1defd1c7fc Merge "Correctly handle local display only for SRM version." 2020-09-09 03:38:48 +00:00
Alex Dale
f22cd20466 Enabled log formatting warnings. 
[ Merge of http://go/wvgerrit/105025 ]

Clang and GCC allow for warnings against the arguments for printf-like
functions (e.i. LOGx).  These validate that the format type specified
in the format string match the corresponding argument type.

Most of the time, format specifer errors are benign; hence why they
haven't been seen as an error so far.  However, with the enabling of
specifier warnings and the enabling of warnings as errors on certain
platforms, these existing errors need to be addressed.

This CL enables format specifier warnings for most of the Widevine
code, with the OEMCrypto L3 implementation which has a single error
which requires a fix in the haystack code before being fixed in the
Widevine branch.

Strict format string warnings are not enabled for non-LP64 systems.

Bug: 137583127
Test: Compiled for Linux and Android
Change-Id: I051398332d31a20457b86563a90ad8f6d428445f
 2020-09-08 15:46:15 -07:00