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

6235 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Coastguard Worker
3dc51c32b6 Snap for 8287852 from 28feb283f3 to tm-release 
Change-Id: I2ac5b04a2dc23d0ffa70c8e902c7acaae052c8e7
 2022-03-11 02:19:43 +00:00
Edwin
28feb283f3 Add lazy service for Widevine AIDL HAL. 
Merged from http://go/wvgerrit/147329

Test: atest VtsAidlHalDrmTargetTest
Test: atest GtsMediaTestCases

Bug: 221078453
Change-Id: I4345816f18c44de4187f03a087d58e890a6d6b01
 2022-03-09 23:30:31 +00:00
Android Build Coastguard Worker
acad889c65 Snap for 8233919 from f2384c1b22 to tm-release 
Change-Id: Idae72185a5d11843c9bccf518b868951fefa7343
 2022-03-01 02:19:42 +00:00
TreeHugger Robot
f2384c1b22 Merge "Update dump() for Aidl HALs." into tm-dev 2022-02-28 17:55:35 +00:00
Sam Dubey
304da5e399 Revert "Enable Widevine Aidl service." 
This reverts commit 2269503129.

Reason for revert: Breaking hal_implementation_test

Bug: 221773661
Change-Id: I85e483fe1fc4f7d71c2cc5c2fc8892b1a57476ab
 2022-02-28 05:57:22 +00:00
Android Build Coastguard Worker
9fc4011714 Snap for 8228242 from 2269503129 to tm-release 
Change-Id: I3fc6920815a66e35520c20390ca334d6822c4b81
 2022-02-26 04:20:00 +00:00
Edwin
b5284c5376 Update dump() for Aidl HALs. 
Merged from http://go/wvgerrit/146589

lshal is for hidl HALs only, dumpsys is for aidl HALs.
Add option "-a" to dump both CDM metrics and properties
because adb bugreport calls dump() with option "-a".

Test: adb bugreport

Bug: 220996660
Change-Id: Ib2a73f3f9f353b8435735dd019a547b62b066725
 2022-02-25 14:00:31 -08:00
Android Build Coastguard Worker
12ec5d9960 Snap for 8215675 from 3fa23b250b to tm-release 
Change-Id: I5cffae4b7ed1477d9c5761c64efb926036a54e2a
 2022-02-24 02:20:17 +00:00
Edwin
2269503129 Enable Widevine Aidl service. 
Merged from http://go/wvgerrit/146409

Bug: 219538389
Test: atest GtsMediaTestCases
Change-Id: I93f1270b304816636babe5a8d76325835793a137
 2022-02-23 17:06:11 +00:00
Android Build Coastguard Worker
6ec28caec7 Snap for 8211163 from 06587fd100 to tm-release 
Change-Id: Ie5b014021092284c793cbe45209f5e1b7b02a1c9
 2022-02-23 02:20:29 +00:00
Robert Shih
3fa23b250b Merge "aidl drm: independent min/max SecurityLevel for each supported mime" into tm-dev 2022-02-23 02:08:46 +00:00
Robert Shih
06587fd100 Merge "wv aidl: fix native handle memory leak" into tm-dev 2022-02-22 20:23:44 +00:00
Robert Shih
7b3a37fa2f Merge "Update cipher mode enumeration in AIDL WvDrmPlugin" into tm-dev 2022-02-22 20:22:11 +00:00
Robert Shih
f2d89aaf77 aidl drm: independent min/max SecurityLevel for each supported mime 
Interface change 16873294

[Merge of go/wvgerrit/145969]

Bug: 219528925
Test: atest MediaDrmTest.testIsCryptoSchemeSupportedForSecurityLevels
Change-Id: I5c0d511358c394aff6885135de851395f199dac0
Merged-In: I5c0d511358c394aff6885135de851395f199dac0
 2022-02-20 19:36:07 +00:00
Robert Shih
0684df3b6c Update cipher mode enumeration in AIDL WvDrmPlugin 
To match the v17 change.

[ Merge of go/wvgerrit/146231 ]

Bug: 216585596
Test: atset WidevineGenericOpsTests
Change-Id: I7eb25a5db30a82cf8015e3c19af419c02a1d5002
Merged-In: I7eb25a5db30a82cf8015e3c19af419c02a1d5002
 2022-02-20 16:04:11 +00:00
Robert Shih
ea1d5d6891 wv aidl: no set security level opening default session 
Bug: 219538389
Test: atest WidevineDashPolicyTests#testL3ValidateKeyOutputProtection
Change-Id: I5912a93fd0b7a144694ec3b251a129d839b8b149
 2022-02-20 16:02:24 +00:00
Robert Shih
c6d7d6e69b wv aidl: fix native handle memory leak 
[ Merge of go/wvgerrit/145971 ]

Bug: 219754570
Test: atest GtsMediaTestCases
Change-Id: Id4705d5bc10ba6dfbe878f2d95fdd9ae9d2e9f1d
Merged-In: Id4705d5bc10ba6dfbe878f2d95fdd9ae9d2e9f1d
 2022-02-20 15:59:51 +00:00
Android Build Coastguard Worker
c21d265b87 Snap for 8191477 from 93b5514a27 to tm-release 
Change-Id: I96389a87d6a790da65510cf29d6a9983a1cab9a0
 2022-02-17 02:20:17 +00:00
Edwin
93b5514a27 Fix gts issues. 
Fix the conversion from in_args.keyId to Cdm format
which causes nullptr dereference signal 11 faults.

Test: atest
  atest-dev GtsMediaTestCases:com.google.android.media.gts.WidevineGenericOpsTests

Bug: 214410088
Change-Id: If84863e2501d4ccae7b8b38dceb707bb4bfa12fb
 2022-02-14 10:42:52 -08:00
Android Build Coastguard Worker
2961eac5a3 Snap for 8176975 from 9654d29be6 to tm-release 
Change-Id: Ic01c5c29acdcfe5c9988a35106b9d0ea66748ca7
 2022-02-12 04:20:16 +00:00
Edwin
9654d29be6 Widevine drm aidl: address API review 
Interface update in change 16810770

Bug: 214410088
Test: atest VtsAidlHalDrmTargetTest
Change-Id: I19da51ef75952f5ff6c7c02e0393f574e69ee30b
 2022-02-09 22:19:36 -08:00
Android Build Coastguard Worker
284ac8595d Snap for 8151064 from 6112060529 to tm-release 
Change-Id: I950acaefd18025bfb31c874559302f09f4c397a7
 2022-02-05 04:20:13 +00:00
Edwin
6112060529 Ran google3 clang-format on cdm source. 
Merge from http://go/wvgerrit/144969

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

Test: atest VtsAidlHalDrmTargetTest

Bug: 216720425
Change-Id: Ie1872d2a48e3b3645853e9831816afecffac747f
 2022-02-03 20:33:05 -08:00
Android Build Coastguard Worker
c4cd4a60ed Snap for 8146528 from f1bfd6f202 to tm-release 
Change-Id: I32c3bf849b01493b6f2ec0d2cbac2f1eaedc8588
 2022-02-04 02:20:01 +00:00
TreeHugger Robot
f4d6ef3858 Merge "Add new test binaries to device-tests.zip package" 2022-02-03 22:00:06 +00:00
Android Build Coastguard Worker
9cf6c441bf Snap for 8142553 from 3c3da01d58 to tm-release 
Change-Id: I724fd830833f2d9308a129929941aec3070e4ace
 2022-02-03 02:22:14 +00:00
Robert Shih
f1bfd6f202 misc wv aidl bug fix to pass vts 
* handle default security level
* init ScopedAStatus before sending events

Bug: 205845199
Test: atest VtsAidlHalDrmTargetTest
Change-Id: Ie72d837bb2b7caa1da2721262b76bd47d5bdab03
 2022-02-01 23:26:15 -08:00
Edwin
3c3da01d58 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

Test:   atest vts_treble_vintf_vendor_test:vts_treble_vintf_vendor_test.DeviceManifest/SingleManifestTest#ManifestAidlHalsServed/0 -- --abi x86_64

Bug: 200055138
Bug: 170964303
Change-Id: I5654d90d8a4b0bae4b4a78e79b27c1cafec36be7
 2022-02-01 22:20:04 -08:00
Kyle Zhang
627c8d6855 Merge "Fix files mis-synced from cdm repo to Android" 2022-02-02 06:07:45 +00:00
Android Build Coastguard Worker
5bcb6b6294 Merge cherrypicks of [16765719] into tm-release. 
Change-Id: Ifeaebbf9fb2791273480399e86606daa33b67961
 2022-02-02 02:40:55 +00:00
Cong Lin
f490a7a624 Update Android L3 after cipher mode fix 
This is a merge of
https://widevine-internal-review.googlesource.com/c/cdm/+/144790

Updated cipher mode to allow playback in v17;
Added check for key selection before decrypting.

Merge from Widevine repo of http://go/wvgerrit/144779
Fix allow_null for key control iv in L3 v17

Merge from Widevine repo of http://go/wvgerrit/144792
Fix api version check in L3 v17

Test: L3 unit tests
Bug: 217145027
Change-Id: I584bd57e26407cbf4d4b94eb1bc5cf80839377be
(cherry picked from commit efbe13ea36)
Merged-In:I584bd57e26407cbf4d4b94eb1bc5cf80839377be
 2022-02-02 02:40:53 +00:00
Android Build Coastguard Worker
b26d76e3bf Snap for 8139020 from a4d835af3a to tm-release 
Change-Id: I9aaf799a5f6704d07d2884e3eac1f90606ae7b8a
 2022-02-02 02:20:20 +00:00
Kyle Zhang
fdc585a55d Fix files mis-synced from cdm repo to Android 
Test: build
Bug: 161477208
Change-Id: I2d48dff987fe37a54ffdfc47a7896fba975a0e20
 2022-02-01 18:08:38 +00:00
Cong Lin
efbe13ea36 Update Android L3 after cipher mode fix 
This is a merge of
https://widevine-internal-review.googlesource.com/c/cdm/+/144790

Updated cipher mode to allow playback in v17;
Added check for key selection before decrypting.

Merge from Widevine repo of http://go/wvgerrit/144779
Fix allow_null for key control iv in L3 v17

Merge from Widevine repo of http://go/wvgerrit/144792
Fix api version check in L3 v17

Test: L3 unit tests
Bug: 217145027
Change-Id: I584bd57e26407cbf4d4b94eb1bc5cf80839377be
 2022-02-01 10:00:40 -08: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 Alexander
abcedf2c5a Add new test binaries to device-tests.zip package 
Test: make -j24, and verify files in test.zip package

Bug: 200180837
Change-Id: If660e56a1eea1e4ff552e5b59b76b67d969ec9c9
 2022-01-28 19:07:26 +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