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

6222 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Shih
14a161b77a [automerger skipped] Merge "wv aidl: fix native handle memory leak" into tm-dev am: 06587fd100 -s ours 
am skip reason: Merged-In Id4705d5bc10ba6dfbe878f2d95fdd9ae9d2e9f1d with SHA-1 c6d7d6e69b is already in history

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

Change-Id: I42274b45020a53514a492fd10a1c4ac8757e3e7d
 2022-02-22 20:38:15 +00:00
Robert Shih
c668b798ec [automerger skipped] Merge "Update cipher mode enumeration in AIDL WvDrmPlugin" into tm-dev am: 7b3a37fa2f -s ours 
am skip reason: Merged-In I7eb25a5db30a82cf8015e3c19af419c02a1d5002 with SHA-1 0684df3b6c is already in history

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

Change-Id: Ieb5bb175ceb186f60de44056a05cf150a2edbbad
 2022-02-22 20:37:55 +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
176c4f4e2a Merge changes from topic "presubmit-am-53eaa6b33a3a42bba34a4724a8ebe4b0" into tm-mainline-prod 
* changes:
  [automerge] wv aidl: fix native handle memory leak 2p: c6d7d6e69b
  wv aidl: fix native handle memory leak
 2022-02-22 20:23:44 +00:00
Robert Shih
aae6a41310 Merge changes from topic "presubmit-am-53eaa6b33a3a42bba34a4724a8ebe4b0" 
* changes:
  [automerged blank] wv aidl: fix native handle memory leak 2p: c6d7d6e69b 2p: f0a49cd60d
  [automerge] wv aidl: fix native handle memory leak 2p: c6d7d6e69b
 2022-02-22 20:23:44 +00:00
Robert Shih
c7d890cece Merge changes from topic "presubmit-am-53eaa6b33a3a42bba34a4724a8ebe4b0" 
* changes:
  [automerged blank] wv aidl: fix native handle memory leak 2p: c6d7d6e69b
  wv aidl: fix native handle memory leak
 2022-02-22 20:23:44 +00:00
Robert Shih
c5c74fa36d Merge changes from topic "presubmit-am-69964c88cf1f4ba9b4fac91dde2f2412" into tm-mainline-prod 
* changes:
  [automerge] Update cipher mode enumeration in AIDL WvDrmPlugin 2p: 0684df3b6c
  Update cipher mode enumeration in AIDL WvDrmPlugin
 2022-02-22 20:22:11 +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
81420ae344 Merge changes from topic "presubmit-am-69964c88cf1f4ba9b4fac91dde2f2412" 
* changes:
  [automerged blank] Update cipher mode enumeration in AIDL WvDrmPlugin 2p: 0684df3b6c 2p: 892a8c39de
  [automerge] Update cipher mode enumeration in AIDL WvDrmPlugin 2p: 0684df3b6c
 2022-02-22 20:22:11 +00:00
Robert Shih
85f77a6c51 Merge changes from topic "presubmit-am-69964c88cf1f4ba9b4fac91dde2f2412" 
* changes:
  [automerged blank] Update cipher mode enumeration in AIDL WvDrmPlugin 2p: 0684df3b6c
  Update cipher mode enumeration in AIDL WvDrmPlugin
 2022-02-22 20:22:11 +00:00
Robert Shih
eb2f0ae6c3 Merge changes from topic "presubmit-am-258ba09a257c4504a1b0595e74a4b7ef" 
* changes:
  [automerge] wv aidl: no set security level opening default session 2p: ea1d5d6891 2p: 88aa7509d7
  [automerge] wv aidl: no set security level opening default session 2p: ea1d5d6891
 2022-02-22 20:21:06 +00:00
Presubmit Automerger Backend
ca4abb96b4 [automerged blank] aidl drm: independent min/max SecurityLevel for each supported mime 2p: f2d89aaf77 2p: 29c148914e 
Blank merge reason: Change-Id I5c0d511358c394aff6885135de851395f199dac0 with SHA-1 8fa2f4774b is in history

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

Bug: 219528925
Change-Id: Id054aff1223984b5f2929b5686e42aa12f395485
Merged-In: I5c0d511358c394aff6885135de851395f199dac0
 2022-02-20 19:36:28 +00:00
Presubmit Automerger Backend
29c148914e [automerge] aidl drm: independent min/max SecurityLevel for each supported mime 2p: f2d89aaf77 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/16952668

Bug: 219528925
Change-Id: Iaaef182b8774feb612a129305c316fb92d3086b2
Merged-In: I5c0d511358c394aff6885135de851395f199dac0
 2022-02-20 19:36:22 +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
507198f7c8 [automerged blank] Update cipher mode enumeration in AIDL WvDrmPlugin 2p: 0684df3b6c 2p: 892a8c39de 
Blank merge reason: Change-Id I7eb25a5db30a82cf8015e3c19af419c02a1d5002 with SHA-1 606828f1a7 is in history

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

Bug: 216585596
Change-Id: Ic55f35d9a93192d3a60b7c621ac90fecb2f4c17c
Merged-In: I7eb25a5db30a82cf8015e3c19af419c02a1d5002
 2022-02-20 16:04:32 +00:00
Robert Shih
892a8c39de [automerge] Update cipher mode enumeration in AIDL WvDrmPlugin 2p: 0684df3b6c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/16961547

Bug: 216585596
Change-Id: Icc232eba7dd2f118c8a9e0276bc8698f8d208322
Merged-In: I7eb25a5db30a82cf8015e3c19af419c02a1d5002
 2022-02-20 16:04:22 +00:00
Robert Shih
0c5a78ab4a [automerged blank] Update cipher mode enumeration in AIDL WvDrmPlugin 2p: 0684df3b6c 
Blank merge reason: Change-Id I7eb25a5db30a82cf8015e3c19af419c02a1d5002 with SHA-1 606828f1a7 is in history

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

Bug: 216585596
Change-Id: Ica266bf18c390fb2f6135c24562d150b15e60379
Merged-In: I7eb25a5db30a82cf8015e3c19af419c02a1d5002
 2022-02-20 16:04:20 +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
3ad3733765 [automerge] wv aidl: no set security level opening default session 2p: ea1d5d6891 2p: 88aa7509d7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/16961544

Bug: 219538389
Change-Id: Id433b7d103efefdb719a7df764445afdd38d08a9
 2022-02-20 16:02:40 +00:00
Robert Shih
88aa7509d7 [automerge] wv aidl: no set security level opening default session 2p: ea1d5d6891 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/16961544

Bug: 219538389
Change-Id: I3c96abb4f814822b7e0f01f467fa4859315c11a6
 2022-02-20 16:02:31 +00:00
Robert Shih
24e2908c21 [automerge] wv aidl: no set security level opening default session 2p: ea1d5d6891 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/16961544

Bug: 219538389
Change-Id: Iaca1768881cb5700ad56c0040bd70853eafbb6ad
 2022-02-20 16:02:31 +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
Presubmit Automerger Backend
fc28eba3f9 [automerged blank] wv aidl: fix native handle memory leak 2p: c6d7d6e69b 2p: f0a49cd60d 
Blank merge reason: Change-Id Id4705d5bc10ba6dfbe878f2d95fdd9ae9d2e9f1d with SHA-1 eed349c158 is in history

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

Bug: 219754570
Change-Id: I15ff5e134d5c74e743cebc5f47588d0e31d35e3d
Merged-In: Id4705d5bc10ba6dfbe878f2d95fdd9ae9d2e9f1d
 2022-02-20 16:00:10 +00:00
Presubmit Automerger Backend
f0a49cd60d [automerge] wv aidl: fix native handle memory leak 2p: c6d7d6e69b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/16952669

Bug: 219754570
Change-Id: Ic7972d7e58fea3d4388bc18c29fe76ed4f36d2ae
Merged-In: Id4705d5bc10ba6dfbe878f2d95fdd9ae9d2e9f1d
 2022-02-20 16:00:03 +00:00
Presubmit Automerger Backend
3877869893 [automerged blank] wv aidl: fix native handle memory leak 2p: c6d7d6e69b 
Blank merge reason: Change-Id Id4705d5bc10ba6dfbe878f2d95fdd9ae9d2e9f1d with SHA-1 eed349c158 is in history

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

Bug: 219754570
Change-Id: I760551732ea5192dd95ac73f0269973eae190965
Merged-In: Id4705d5bc10ba6dfbe878f2d95fdd9ae9d2e9f1d
 2022-02-20 16:00:01 +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
Robert Shih
606828f1a7 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
 2022-02-19 01:13:59 +00:00
Robert Shih
926f1f9ea6 Merge "wv aidl: fix native handle memory leak" 2022-02-17 23:46:55 +00:00
Robert Shih
481a1d719e Merge "aidl drm: independent min/max SecurityLevel for each supported mime" 2022-02-17 21:31:08 +00:00
Robert Shih
eed349c158 wv aidl: fix native handle memory leak 
[ Merge of go/wvgerrit/145971 ]

Bug: 219754570
Test: atest GtsMediaTestCases
Change-Id: Id4705d5bc10ba6dfbe878f2d95fdd9ae9d2e9f1d
 2022-02-17 01:01:21 +00:00
Robert Shih
8fa2f4774b 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
 2022-02-16 20:44:52 +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
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
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
TreeHugger Robot
f4d6ef3858 Merge "Add new test binaries to device-tests.zip package" 2022-02-03 22:00:06 +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
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
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
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
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
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
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