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

6202 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
6eb5161dc1 Merge "wv aidl: fix native handle memory leak 2" into tm-dev 2022-03-11 05:20:59 +00:00
Edwin
8b7135134f Add lazy service for Widevine AIDL HAL. am: 28feb283f3 am: 0bf6d6a469 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17091932

Change-Id: Ibef4d9d8ca33e8837bb15405c06515a20521cf26
 2022-03-10 19:50:53 +00:00
Edwin
366b54d522 Add lazy service for Widevine AIDL HAL. am: 28feb283f3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17091932

Change-Id: Iae533b0a29389eaf456b0d41faf7d946d4269fd0
 2022-03-10 19:29:18 +00:00
Edwin
0bf6d6a469 Add lazy service for Widevine AIDL HAL. am: 28feb283f3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17091932

Change-Id: I25ee15d212c33385ea418f31012e4b4ecddf2f98
 2022-03-10 19:27:46 +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
TreeHugger Robot
af7da0db1f Merge "Update dump() for Aidl HALs." into tm-dev am: f2384c1b22 am: f8ac8e07d4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/16994828

Change-Id: I404ba447feb8bdd3bed3bbe005084770fb7d0813
 2022-02-28 18:41:11 +00:00
TreeHugger Robot
a4489b0998 Merge "Update dump() for Aidl HALs." into tm-dev am: f2384c1b22 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/16994828

Change-Id: I5cb2f380da652bb0802b77464fa8f320bb6a19e3
 2022-02-28 18:20:32 +00:00
TreeHugger Robot
f8ac8e07d4 Merge "Update dump() for Aidl HALs." into tm-dev am: f2384c1b22 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/16994828

Change-Id: Iba64235e754aaef9619871615bce1e2e9bcf4d8b
 2022-02-28 18:19:49 +00:00
TreeHugger Robot
f2384c1b22 Merge "Update dump() for Aidl HALs." into tm-dev 2022-02-28 17:55:35 +00:00
Sam Dubey
24fa58799b Revert "Enable Widevine Aidl service." am: 304da5e399 am: bb3db4073a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17030421

Change-Id: I15e465a32ae324a0da01139e2bbe05c0bcf6504d
 2022-02-28 08:46:49 +00:00
Sam Dubey
6d4656c416 Revert "Enable Widevine Aidl service." am: 304da5e399 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17030421

Change-Id: Ie89d3c4a913c16360130a6a8e3e7cc15561d8317
 2022-02-28 08:26:42 +00:00
Sam Dubey
bb3db4073a Revert "Enable Widevine Aidl service." am: 304da5e399 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17030421

Change-Id: Ia22fec5d563b919d195241174f4baaccef688d07
 2022-02-28 08:25:31 +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
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
Edwin
0b378e2bd1 Enable Widevine Aidl service. am: 2269503129 am: a3a6f1e853 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/16984707

Change-Id: Ice9a398bf024438ef2d2dc7de22f576202f8ac70
 2022-02-25 20:41:20 +00:00
Edwin
b346e7ef85 Enable Widevine Aidl service. am: 2269503129 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/16984707

Change-Id: If2faf4513ae5c2d943bfeee7176a2c07a0414c90
 2022-02-25 20:33:18 +00:00
Edwin
a3a6f1e853 Enable Widevine Aidl service. am: 2269503129 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/16984707

Change-Id: I8623d82f74e72194ce04b8369ad88c1bda076206
 2022-02-25 20:17:49 +00:00
Jeffrey Kardatzke
6b7f2f34a9 libwvdrmengine: Add custom CDM properties for ARCVM 
We need to have extra properties we can check for this so they don't
conflict with the main ones for ro.product.{manufacturer|make|device}.

Bug: 197771575
Test: None

Change-Id: I63d57d59f3473beaa825b9f20e711f15d6280461
(cherry picked from commit 0f000ac305528059fc6ebdf4a3c82dd698ef4161)
(cherry picked from commit f46a1b9adcdaa103c394a2017a58e0ab6a6a4c77)
 2022-02-23 19:19:21 +00:00
Robert Shih
21cbd7906e [automerger skipped] Merge "aidl drm: independent min/max SecurityLevel for each supported mime" into tm-dev am: 3fa23b250b -s ours am: 89cd3b2b46 -s ours 
am skip reason: Merged-In I5c0d511358c394aff6885135de851395f199dac0 with SHA-1 f2d89aaf77 is already in history

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

Change-Id: I7f5ef4561b2a8f4565c5e063deb5bd5ba9bd255b
 2022-02-23 17:48:53 +00:00
Robert Shih
89cd3b2b46 [automerger skipped] Merge "aidl drm: independent min/max SecurityLevel for each supported mime" into tm-dev am: 3fa23b250b -s ours 
am skip reason: Merged-In I5c0d511358c394aff6885135de851395f199dac0 with SHA-1 f2d89aaf77 is already in history

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

Change-Id: I357e466041cc8b4fa28e53306646da42daf5eeff
 2022-02-23 17:14:02 +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
Robert Shih
9386d774f1 [automerger skipped] Merge changes from topic "cherrypick-SupportedContentType-myxl3uejg2" into tm-mainline-prod am: 438a40b016 -s ours 
am skip reason: Merged-In I5c0d511358c394aff6885135de851395f199dac0 with SHA-1 f2d89aaf77 is already in history

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

Change-Id: Id2896de094647ffe879a60fd51caa9547908165b
 2022-02-23 16:51:14 +00:00
Robert Shih
c5aa870dbd wv aidl: fix native handle memory leak 2 
[ Merge of go/wvgerrit/146369 ]

Bug: 219754570
Test: atest GtsMediaTestCases
Change-Id: Id3e443d5e39ae416d6e566a129ebed423e19e98d
 2022-02-23 09:40:15 +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
438a40b016 Merge changes from topic "cherrypick-SupportedContentType-myxl3uejg2" into tm-mainline-prod 
* changes:
  [automerge] aidl drm: independent min/max SecurityLevel for each supported mime 2p: f2d89aaf77
  aidl drm: independent min/max SecurityLevel for each supported mime
 2022-02-23 02:08:46 +00:00
Robert Shih
87c09d08a1 Merge changes from topic "cherrypick-SupportedContentType-myxl3uejg2" 
* changes:
  [automerged blank] aidl drm: independent min/max SecurityLevel for each supported mime 2p: f2d89aaf77 2p: 29c148914e
  [automerge] aidl drm: independent min/max SecurityLevel for each supported mime 2p: f2d89aaf77
  aidl drm: independent min/max SecurityLevel for each supported mime
 2022-02-23 02:08:46 +00:00
Robert Shih
436511707e [automerger skipped] Merge "wv aidl: fix native handle memory leak" into tm-dev am: 06587fd100 -s ours am: 14a161b77a -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: I338fae6d0c415aa1fbcf8b01289615bb59f9cd41
 2022-02-22 20:40:36 +00:00
Robert Shih
b2800169e0 [automerger skipped] Merge "Update cipher mode enumeration in AIDL WvDrmPlugin" into tm-dev am: 7b3a37fa2f -s ours am: c668b798ec -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: I338d35bc76dbfcab7d3e8bac4157b56d6e26b527
 2022-02-22 20:40:29 +00:00
Robert Shih
2687bcf667 [automerger skipped] Merge changes from topic "presubmit-am-53eaa6b33a3a42bba34a4724a8ebe4b0" into tm-mainline-prod am: 176c4f4e2a -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: Ib0a3094768133636f73bc5714a9b0675691cf408
 2022-02-22 20:40:21 +00:00
Robert Shih
5eae50d688 [automerger skipped] Merge changes from topic "presubmit-am-69964c88cf1f4ba9b4fac91dde2f2412" into tm-mainline-prod am: c5c74fa36d -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: Id47dfb7a916611f0fcf202e4bed993ff0b3fb076
 2022-02-22 20:39:34 +00:00
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