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

6201 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Coastguard Worker
b26d76e3bf Snap for 8139020 from a4d835af3a to tm-release 
Change-Id: I9aaf799a5f6704d07d2884e3eac1f90606ae7b8a
 2022-02-02 02:20:20 +00:00
Android Build Coastguard Worker
6e0bd1dad4 Merge cherrypicks of [16762582, 16762573] into tm-release. 
Change-Id: I97ccd5c2d7e141adfc478cf48ea0782a09371ff4
 2022-02-01 05:20:55 +00:00
Daniel Chapin
5558e492c9 Revert "Merge latest oemcrypto-v17 change" 
This reverts commit 642965c678.

Reason for revert: Droidfood Blocking Bug: 217145027

Change-Id: I669b72fcd91c62e28883b5f55eb36af274d85806
(cherry picked from commit 8dbea15e5da05b371572297041454569dc166c90)
Merged-In:I669b72fcd91c62e28883b5f55eb36af274d85806
 2022-02-01 05:20:54 +00:00
Yohei Yukawa
860a48ff8c Revert "Use aidl interface for Widevine service." 
This reverts commit 96a8ccd4a1.

Reason for revert:
Could break DeviceManifest/SingleManifestTest#ManifestAidlHalsServed

Bug: 200055138
Bug: 170964303
Bug: 217241995
Change-Id: I9c42df15defec428c9ef8c62439c63d4a603fee6
(cherry picked from commit a4d835af3a)
Merged-In:I9c42df15defec428c9ef8c62439c63d4a603fee6
 2022-02-01 05:20:52 +00:00
Android Build Coastguard Worker
6e50c60bf7 Snap for 8135676 from 96a8ccd4a1 to tm-release 
Change-Id: Ia456e73cfa816e574b2ae4c104c79280988e6115
 2022-02-01 02:20:07 +00:00
Android Build Coastguard Worker
69cc8cdb8c Merge cherrypicks of [16762573] into tm-release. 
Change-Id: Ia883a1c7017ba7c40d4a2c58bf6a43861942bace
 2022-01-31 23:10:52 +00:00
Daniel Chapin
d69b488be1 Revert "Merge latest oemcrypto-v17 change" 
This reverts commit 642965c678.

Reason for revert: Droidfood Blocking Bug: 217145027

Change-Id: I669b72fcd91c62e28883b5f55eb36af274d85806
(cherry picked from commit 8dbea15e5da05b371572297041454569dc166c90)
Merged-In:I669b72fcd91c62e28883b5f55eb36af274d85806
 2022-01-31 23:10:49 +00:00
Yohei Yukawa
a4d835af3a Revert "Use aidl interface for Widevine service." 
This reverts commit 96a8ccd4a1.

Reason for revert:
Could break DeviceManifest/SingleManifestTest#ManifestAidlHalsServed

Bug: 200055138
Bug: 170964303
Bug: 217241995
Change-Id: I9c42df15defec428c9ef8c62439c63d4a603fee6
 2022-01-31 22:01:25 +00:00
Edwin
96a8ccd4a1 Use aidl interface for Widevine service. 
The interface is defined in
hardware/interfaces/drm/aidl(http://go/ag/15329852).

Test: build
  m android.hardware.drm-service.widevine -j128

Test: build_and_run_all_unit_tests.sh
  for hidl tests

Test: atest VtsAidlHalDrmTargetTest

Bug: 200055138
Bug: 170964303
Change-Id: If2f2a129914436ba5cef1c46f6cb9415e12c3d1c
 2022-01-28 20:29:14 -08:00
Android Build Coastguard Worker
1397b61f87 Snap for 8130893 from 642965c678 to tm-release 
Change-Id: I46416ab2b559011d4476eb68075cf8de301cd4e8
 2022-01-29 04:19:49 +00:00
Kyle Zhang
642965c678 Merge latest oemcrypto-v17 change 
No-Typo-Check: Not related to this change.

Bug: 161477208
Change-Id: I99e4780f6855b7045aa0cd5a49c13d2d0d51ed64
 2022-01-27 20:07:15 -08:00
Bob Badour
c924960962 [LSC] Add LOCAL_LICENSE_KINDS to vendor/widevine 
Added legacy_by_exception_only to:
  libwvdrmengine/cdm/test/coverage-test.mk

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Change-Id: I245a84bb0ef081a4faedde51f0e815478172db51
 2022-01-27 12:14:56 -08:00
Android Build Coastguard Worker
8159a189bf Snap for 8120673 from 5b48015370 to tm-release 
Change-Id: I260407b27168bcb16e3f7127d6c0f98f0192036a
 2022-01-27 02:20:42 +00:00
Alex Dale
5b48015370 Added cdm_coverage_test to WIDEVINE_TEST_MAKE_TARGETS. 
Bug: 138941105
Bug: 191681397
Test: Forrest run
Change-Id: Ib180e1da9a272edd4a95fb3b3013bdb643891f8e
 2022-01-25 19:52:18 -08:00
Android Build Coastguard Worker
2877d37ab9 Snap for 8112519 from 8500365f8c to tm-release 
Change-Id: I8f0c868e7d5cbfb59d46a2029f7f2a0cc94f319e
 2022-01-25 02:20:08 +00:00
Rahul Frias
8500365f8c Merge "Protect against race conditions when adding a license" 2022-01-24 22:33:48 +00:00
Rahul Frias
af99d774d4 Merge "Protect against race conditions when removing keys" 2022-01-24 22:31:58 +00:00
Android Build Coastguard Worker
8a3b5ab3d8 Snap for 8105868 from 2e738c2989 to tm-release 
Change-Id: I5f94422243c0f882f0c642f6bf67a9dd597e5df4
 2022-01-22 04:19:50 +00:00
TreeHugger Robot
2e738c2989 Merge "Fix errors being hidden by Protobuf warning-disabling" 2022-01-22 00:02:03 +00:00
TreeHugger Robot
38832ed40e Merge "Upgrade MOCK_METHOD to googletest 1.10" 2022-01-22 00:01:43 +00:00
John "Juce" Bruce
df23c7da03 Fix errors being hidden by Protobuf warning-disabling 
(This is a merge of http://go/wvgerrit/140850.)

This patch fixes a number of minor issues in the codebase (mostly
instances of 0-as-nullptr, but also some member shadowing and a missing
override) that were being hidden by the fact that depending on Protobuf
disables these diagnostics. And which will be unhidden when a later
patch removes that behavior from Protobuf.

Bug: 208304830
Test: x86-64
Change-Id: I4b0b1264748880b3726a6388d589868d898f949e
 2022-01-21 01:49:40 +00:00
John "Juce" Bruce
5606e7dae3 Upgrade MOCK_METHOD to googletest 1.10 
(This is a merge of http://go/wvgerrit/139989.)

Googletest added a new, more powerful MOCK_METHOD() macro in 1.10. This
patch updates all our usage of the old MOCK_METHOD family to the new
macro. Full details can be found at
https://github.com/google/googletest/blob/release-1.10.0/googlemock/docs/cook_book.md#creating-mock-classes
but in brief, the new MOCK_METHOD() replaces the entire old MOCK_METHOD
family and has the following advantages:

1) No need to count parameters or update the macro name when changing
   parameters.
2) No need for a different macro for const methods.
3) The ability to specify override, noexcept, and other function
   qualifiers.
4) The macro order is now the same as C++ method definition order:
   Return Type -> Name -> Arguments -> Qualifiers

In addition to upgrading all our usage sites to the new macro, the
addition of the override qualifier to our MOCK_METHODs helped uncover
several cases where we were using MOCK_METHOD to override methods that
didn't exist. This is a great example of why the override qualifier is
so useful. These places have been updated, by removing the invalid and
unused mock method.

Bug: 207693687
Test: build_and_run_all_unit_tests
Change-Id: Iaad4a22c7f72bb48b1356fe01a41eb0a2f555244
 2022-01-21 01:49:28 +00:00
Alex Dale
4c6e10f7d6 Created a unified Android test for coverage. 
[ Merge of http://go/wvgerrit/143889 ]

New test binary for generating code coverage information.  Run several
reliable, short runnning unit tests.  Actual test failures do not
affect the result of this test.

Bug: 138941105
Bug: 191681397
Test: Android cdm_coverage_test
Change-Id: I6b74d361a8a0e2896e0489acaa64d264158ecaa4
 2022-01-20 13:57:40 -08:00
Android Build Coastguard Worker
9675c30ddb Snap for 8082780 from e5822def1d to tm-release 
Change-Id: I98cedf4fe695b99fd160d4f1d5b3d499ac395626
 2022-01-15 04:20:32 +00:00
Alex Dale
e5822def1d Better error code checking for missing device ID. am: b77a30bf3d am: 4d9d13db34 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/16624955

Change-Id: Iae13e720334cc30f98e2faa9bf7810d65e174c76
 2022-01-14 23:10:59 +00:00
Alex Dale
4d9d13db34 Better error code checking for missing device ID. am: b77a30bf3d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/16624955

Change-Id: Ic02ad8f4ddef3b49731ffe8c138a4d946c43a965
 2022-01-14 22:58:57 +00:00
Alex Dale
b77a30bf3d Better error code checking for missing device ID. 
[ Merge of http://go/wvgerrit/143370 ]
[ Cherry-pick off http://ag/16624952 ]

Devices without a keybox may not have access to a device ID if the OEM
uses the device ID from the keybox as its source of truth.  For
devices which have lost their keybox, OEMCrypto_GetDeviceID() was
assumed to return ERROR_KEYBOX_INVALID if that was the case; however,
Qualcomm's implementation was returning ERROR_NO_DEVICEID.  Given that
both error codes are appropriate, the CDM has been updated to accept
both as an indication that the device ID cannot be retrieved, and that
the null device ID should be returned.

Bug: 190504842
Bug: 214113125
Test: Manual test
Change-Id: I8fb8a1bddfe895062b707b51fcadffd983adb40e
 2022-01-13 16:03:45 -08:00
Android Build Coastguard Worker
e64d0c3699 Snap for 8055626 from b0878cae62 to tm-release 
Change-Id: I45408ff34740fba34e156e985e7f946dd29a8771
 2022-01-08 04:20:04 +00:00
Fred Gylys-Colwell
b0878cae62 Fallback to L3 if provisioning lost am: df0cfa2daa am: f3b26aaf2c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/16523000

Change-Id: Ibd8c4d27c23086d1fe8ee7d286a00787e8704464
 2022-01-07 06:08:39 +00:00
Fred Gylys-Colwell
2897ed2ed5 Fall back to L3 if L1 has test keybox am: 31faf51933 am: cbb5bd0f7a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/16507243

Change-Id: I4159f77db5748bde567466157ce5f07be7f64e55
 2022-01-07 06:08:39 +00:00
Fred Gylys-Colwell
550c512804 [automerger skipped] Add MediaDrm property to allow test keybox am: df04f3f0f8 am: 9dbc32089f -s ours 
am skip reason: Merged-In I85b96f127abe30f8f061b242f7580fa8f6c01776 with SHA-1 04e1d8efbc is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/16507299

Change-Id: Ia2e41e753c6be808e497670d0d2d73641a7ad251
 2022-01-07 06:08:38 +00:00
Fred Gylys-Colwell
2f964df424 Test session should continue with no keybox am: 75b87c7f59 am: 78d0b73964 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/16507242

Change-Id: I448766407f548908468143aa2ca2e45b8362c10d
 2022-01-07 06:08:37 +00:00
Fred Gylys-Colwell
0b0b1abdb4 Skip OTA test if not supported am: 2f57079f6a am: 76bbdba1e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/16507241

Change-Id: Ib62bd5f289d770dbcc865ae4b77fd30e8d1ea461
 2022-01-07 06:08:37 +00:00
Fred Gylys-Colwell
41835c7f24 Handle nonce flood in OTA test am: 3c7528de62 am: 5e5913818d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/16507240

Change-Id: I688bcc9f5e41cb56a83ae48fd549a3a9c4ec5bc2
 2022-01-07 06:08:36 +00:00
Alex Dale
57837fcc35 Open session when checking for OTA keybox support. am: 2d1372fbec am: 25098c88e8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/16496630

Change-Id: I25487f3154eff003f043fada11ef4637ab1a324a
 2022-01-07 06:08:35 +00:00
Alex Dale
7e8a8d6a90 Return failure if ignore keybox debug count is non-zero. am: 1b35b915b5 am: d2c1aec4a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/16496629

Change-Id: I541c6134f8c01612b9fb6b91f7217aad45d558e3
 2022-01-07 06:08:34 +00:00
Fred Gylys-Colwell
f3b26aaf2c Fallback to L3 if provisioning lost am: df0cfa2daa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/16523000

Change-Id: Ifaaabed1490c01954fba70290b893b1cceb40748
 2022-01-07 05:57:14 +00:00
Fred Gylys-Colwell
cbb5bd0f7a Fall back to L3 if L1 has test keybox am: 31faf51933 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/16507243

Change-Id: I68c4410d36a984062a041846c131ea90c0c8c646
 2022-01-07 05:57:13 +00:00
Fred Gylys-Colwell
9dbc32089f Add MediaDrm property to allow test keybox am: df04f3f0f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/16507299

Change-Id: I734f26fa06a19ac6e8526bfdaa074fb5a8bbdab3
 2022-01-07 05:57:13 +00:00
Fred Gylys-Colwell
78d0b73964 Test session should continue with no keybox am: 75b87c7f59 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/16507242

Change-Id: I41ad0bd10056a3f1615d390a0b33b42cfcd6e4b3
 2022-01-07 05:57:12 +00:00
Fred Gylys-Colwell
76bbdba1e5 Skip OTA test if not supported am: 2f57079f6a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/16507241

Change-Id: If8bf505db0424e596f946f51daafc7b66233e0e5
 2022-01-07 05:57:11 +00:00
Fred Gylys-Colwell
5e5913818d Handle nonce flood in OTA test am: 3c7528de62 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/16507240

Change-Id: I3fabca84341ff313f569780c3b7e253a44af4d05
 2022-01-07 05:57:11 +00:00
Alex Dale
25098c88e8 Open session when checking for OTA keybox support. am: 2d1372fbec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/16496630

Change-Id: Ia16f9c4cf293520047faeae2d69b5c8f05f47439
 2022-01-07 05:57:10 +00:00
Alex Dale
d2c1aec4a7 Return failure if ignore keybox debug count is non-zero. am: 1b35b915b5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/16496629

Change-Id: Ibf4fcd015569173fb3779f1a0b09d9e137f84a83
 2022-01-07 05:57:09 +00:00
Fred Gylys-Colwell
1373c554a8 Fix System ID problem for devices with no keybox am: f6d682b182 am: bf776ef27d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/16408945

Change-Id: I5e1965104ff03a6d973ecf3727121d9f91dc1e26
 2022-01-07 03:56:14 +00:00
Alex Dale
564c68135c Correctly record license service version in metrics. am: 8aabf20134 am: c645c398c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/16416872

Change-Id: I875b44c863f4f73e6e0d0f043e127b9a6381f81e
 2022-01-07 03:56:07 +00:00
Fred Gylys-Colwell
bf776ef27d Fix System ID problem for devices with no keybox am: f6d682b182 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/16408945

Change-Id: I26c5d75affe116c56665de4a038e008ba34bd0d7
 2022-01-07 03:48:24 +00:00
Alex Dale
c645c398c5 Correctly record license service version in metrics. am: 8aabf20134 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/16416872

Change-Id: Ic3fe7f7bc7f425f6e1a3071b098f0c602e6ac927
 2022-01-07 03:48:18 +00:00
Android Build Coastguard Worker
035e7114d7 Snap for 8027157 from 04e1d8efbc to tm-release 
Change-Id: I04330fd2aeb0b11e7f13d194ec742e9316277cba
 2021-12-24 02:20:00 +00:00
Fred Gylys-Colwell
df0cfa2daa Fallback to L3 if provisioning lost 
Merge from Widevine repo of http://go/wvgerrit/142349

If a provisioning request is sent, but no response is loaded, we
should fall back to L3. This covers the case where the OTA request is
malformed and the provisioning server ignores it.

This might happen if the device has a bad KM key.

Test: manual testing
Bug: 210823889
Bug: 210807585
Change-Id: I951241539ace97b668868d5abf8a9811d874fb28
 2021-12-23 20:19:27 +00:00