Commit Graph

7840 Commits

Author SHA1 Message Date
Kyle Zhang
a1d7a42cf6 Drop Widevine apex prebuilt files to android source tree.
The following files have been updated as part of this change:

libwvdrmengine/apex/prebuilt/com.google.android.widevine.lazy.apks[standalones/standalone-arm64_v8a.apex]
package: name=com.google.android.widevine.lazy
versionCode=340720000
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=34
compileSdkVersionCodename=UpsideDownCake
sdkVersion:34
targetSdkVersion:34

libwvdrmengine/apex/prebuilt/com.google.android.widevine.lazy.apks[standalones/standalone-armeabi_v7a.apex]
package: name=com.google.android.widevine.lazy
versionCode=340720000
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=34
compileSdkVersionCodename=UpsideDownCake
sdkVersion:34
targetSdkVersion:34

libwvdrmengine/apex/prebuilt/com.google.android.widevine.lazy.apks[standalones/standalone-x86.apex]
package: name=com.google.android.widevine.lazy
versionCode=340720000
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=34
compileSdkVersionCodename=UpsideDownCake
sdkVersion:34
targetSdkVersion:34

libwvdrmengine/apex/prebuilt/com.google.android.widevine.lazy.apks[standalones/standalone-x86_64.apex]
package: name=com.google.android.widevine.lazy
versionCode=340720000
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=34
compileSdkVersionCodename=UpsideDownCake
sdkVersion:34
targetSdkVersion:34

libwvdrmengine/apex/prebuilt/com.google.android.widevine.nonupdatable.apks[standalones/standalone-arm64_v8a.apex]
package: name=com.google.android.widevine.nonupdatable
versionCode=340720000
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=34
compileSdkVersionCodename=UpsideDownCake
sdkVersion:34
targetSdkVersion:34

libwvdrmengine/apex/prebuilt/com.google.android.widevine.nonupdatable.apks[standalones/standalone-armeabi_v7a.apex]
package: name=com.google.android.widevine.nonupdatable
versionCode=340720000
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=34
compileSdkVersionCodename=UpsideDownCake
sdkVersion:34
targetSdkVersion:34

libwvdrmengine/apex/prebuilt/com.google.android.widevine.nonupdatable.apks[standalones/standalone-x86.apex]
package: name=com.google.android.widevine.nonupdatable
versionCode=340720000
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=34
compileSdkVersionCodename=UpsideDownCake
sdkVersion:34
targetSdkVersion:34

libwvdrmengine/apex/prebuilt/com.google.android.widevine.nonupdatable.apks[standalones/standalone-x86_64.apex]
package: name=com.google.android.widevine.nonupdatable
versionCode=340720000
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=34
compileSdkVersionCodename=UpsideDownCake
sdkVersion:34
targetSdkVersion:34

Built here: ab/10167125

The change is generated with prebuilt drop tool.

Bug: 279835636
Change-Id: Ic4cb80f7e20e7cee6e89ae1c0197d9cb624e6211
2023-05-30 21:37:16 +00:00
John Bruce
959982c2d1 Revert "Sony Patch to LicenseKeys::GetAllowedUsage()"
This reverts commit 7f16e103e6.

Reason for revert: Widevine has historically kept the Widevine and Android master branches in sync. But since the impact to Android is minimal, this change doesn't meet the bar for Android UDC-QPR2 or any other QPR. And in the new rolling release model, master(main) is now UDC-QPR2, so there's nowhere this code can be checked in on the Android side at this time. Reverting the original, premature sync of the change from the Widevine repo.

Change-Id: I4382750956cf7e472741760cef315f0871d5f4f5
2023-05-25 19:00:20 +00:00
John "Juce" Bruce
7f16e103e6 Sony Patch to LicenseKeys::GetAllowedUsage()
Merged from http://go/wvgerrit/175350.

Sony has identified a 5-year-old copy-and-paste error in
LicenseKeys::GetAllowedUsage(). For entitled keys, it was calling
CanDecryptContent() instead of GetAllowedUsage() on the entitlement key
session. This meant that for entitled keys, the allowed_usage parameter
was never updated and the return value of the function was indicating
something different than intended.

Bug: 280902715
Test: build_and_run_all_unit_tests
Change-Id: Ic1db01b6dce08d444572f53157ff08b337c48d31
2023-05-23 18:08:31 +00:00
Jooyung Han
233c079a53 Fix build script: set output path explicitly am: 49cc8da350
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23246770

Change-Id: I0d8164d0820d3535641b53dbfdf8038168abc1d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 01:05:37 +00:00
Jooyung Han
51d672f963 Fix build script: set output path explicitly am: 49cc8da350 am: 32bf611f35 am: 1967d0ea64 am: 67215c0055
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23246770

Change-Id: I7f903aff5df3df63b88448be5ae8fbb5a4f85c35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 22:53:37 +00:00
Jooyung Han
cf0b836f7d Fix build script: set output path explicitly am: 49cc8da350 am: 425e5e15d7 am: d57e4d55e4 am: 30138aac5a
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23246770

Change-Id: Ib79824d44486fef7b49e868a376ffa15b448254d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 22:52:50 +00:00
Jooyung Han
6631118032 Fix build script: set output path explicitly am: 49cc8da350 am: 32bf611f35 am: cff6ce0f81 am: 62346ca67c
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23246770

Change-Id: I6e48ab92d2aecbd4d15404f9d70965c71fe84e77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 22:32:40 +00:00
Jooyung Han
67215c0055 Fix build script: set output path explicitly am: 49cc8da350 am: 32bf611f35 am: 1967d0ea64
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23246770

Change-Id: I528e14fccd10d681082117c5db23d458f0b195f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 21:51:12 +00:00
Jooyung Han
30138aac5a Fix build script: set output path explicitly am: 49cc8da350 am: 425e5e15d7 am: d57e4d55e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23246770

Change-Id: I7251262ef2a0d4749a66bb09216ca17187db7309
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 21:49:25 +00:00
Jooyung Han
62346ca67c Fix build script: set output path explicitly am: 49cc8da350 am: 32bf611f35 am: cff6ce0f81
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23246770

Change-Id: I4062b49f76ac558bef274f8a1dbd1f5c5e539c92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 21:47:24 +00:00
Jooyung Han
d57e4d55e4 Fix build script: set output path explicitly am: 49cc8da350 am: 425e5e15d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23246770

Change-Id: I5073da9c9137dff64b77c828172ea9406bdfcfd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 21:05:19 +00:00
Jooyung Han
1967d0ea64 Fix build script: set output path explicitly am: 49cc8da350 am: 32bf611f35
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23246770

Change-Id: Idb6c4845a7360da81514a5bf9bf57b911fe4adc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 21:04:46 +00:00
Jooyung Han
cff6ce0f81 Fix build script: set output path explicitly am: 49cc8da350 am: 32bf611f35
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23246770

Change-Id: Icae33627d0c1a4e3a6fdeb78de3465fd26e3a95b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 21:03:29 +00:00
Jooyung Han
9baac89008 Fix build script: set output path explicitly am: 49cc8da350 am: ac1ede5d73
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23246770

Change-Id: I56c63b308731e158e9a01ac470fc6985ee19b3ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 21:03:06 +00:00
Jooyung Han
ac1ede5d73 Fix build script: set output path explicitly am: 49cc8da350
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23246770

Change-Id: Iae6b54b2ddc4e643ecf8fed09e3af92abaa6c909
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 20:11:41 +00:00
Jooyung Han
425e5e15d7 Fix build script: set output path explicitly am: 49cc8da350
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23246770

Change-Id: Id8796c3ab15909b3e33e559bd19202c6ab35c24c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 20:09:40 +00:00
Jooyung Han
32bf611f35 Fix build script: set output path explicitly am: 49cc8da350
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23246770

Change-Id: I121d3db92d5bc22105eb3f9cbc059d18515b4134
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 20:09:28 +00:00
Vicky Min
a743a5c07c Fix oec session id in dynamic adpater am: 74a9f80790 am: 2b62113f19 am: f7f0278f09 am: c27a74158d
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23246132

Change-Id: I47f099ba63b95592f9f3e5be2d23fd5f16bba87a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 05:51:53 +00:00
Vicky Min
d820360910 Fix oec session id in dynamic adpater am: 74a9f80790 am: 2b62113f19 am: 9add9d9e71 am: 39aedc7142
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23246132

Change-Id: Iac0094b122205afc72ef908ae98bfd06151c61d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 05:48:52 +00:00
Vicky Min
ae0f032e13 Fix oec session id in dynamic adpater am: 74a9f80790 am: d82d878d4c am: 534c03eea2 am: 36531d1b3e
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23246132

Change-Id: I4de37080c76bdbbc0c51272412aa80ae45e825f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 05:45:27 +00:00
Vicky Min
c27a74158d Fix oec session id in dynamic adpater am: 74a9f80790 am: 2b62113f19 am: f7f0278f09
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23246132

Change-Id: I40f107ed163b5b438b42f5c97ca15e0c99f5cdcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 04:38:03 +00:00
Jooyung Han
49cc8da350 Fix build script: set output path explicitly
dev_sign_bundle uses `out/dist` as default out directory. It should
respect DIST_DIR setting.

Bug: 281617982
Test: git_mainline-widevine-release/mainline_modules-user
Change-Id: I2ede21b099b512c948e4e83702a1478982acc779
2023-05-16 13:35:34 +09:00
Vicky Min
39aedc7142 Fix oec session id in dynamic adpater am: 74a9f80790 am: 2b62113f19 am: 9add9d9e71
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23246132

Change-Id: Ic3a2495a13c00320bd76e7889891b854d401392d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 04:15:49 +00:00
Vicky Min
36531d1b3e Fix oec session id in dynamic adpater am: 74a9f80790 am: d82d878d4c am: 534c03eea2
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23246132

Change-Id: I4a7c3e5cd98d4c4a0c24b71b4ee1d9fb1f11e31c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 04:14:43 +00:00
Vicky Min
f7f0278f09 Fix oec session id in dynamic adpater am: 74a9f80790 am: 2b62113f19
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23246132

Change-Id: Ic3d7139af838fa91b39783028fdc5029726ed6c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 03:51:37 +00:00
Vicky Min
8132bb7e84 Fix oec session id in dynamic adpater am: 74a9f80790 am: 197bb32b42
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23246132

Change-Id: Ibb2ab6d79d389d836c1949a503c31b334a4e40b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 03:49:26 +00:00
Vicky Min
9add9d9e71 Fix oec session id in dynamic adpater am: 74a9f80790 am: 2b62113f19
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23246132

Change-Id: I601383aebedd65fcfcb7fcd6e9b55a1a60e9bac8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 03:49:24 +00:00
Vicky Min
534c03eea2 Fix oec session id in dynamic adpater am: 74a9f80790 am: d82d878d4c
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23246132

Change-Id: I0344315efa3537995cd7ec7dbf9d9536bad5f5bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 03:32:49 +00:00
Vicky Min
2b62113f19 Fix oec session id in dynamic adpater am: 74a9f80790
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23246132

Change-Id: I31ff36896dd05e4500fc1f3c4b95645cf7c682fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 03:11:39 +00:00
Vicky Min
197bb32b42 Fix oec session id in dynamic adpater am: 74a9f80790
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23246132

Change-Id: Ie6bad7f0c582f7eb205325037d36c316b90ab317
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 03:11:32 +00:00
Vicky Min
d82d878d4c Fix oec session id in dynamic adpater am: 74a9f80790
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23246132

Change-Id: I3c1b3d7f991465b98e15b53813f588d228251fde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 03:07:22 +00:00
Vicky Min
74a9f80790 Fix oec session id in dynamic adpater
[ Merge of http://go/wvgerrit/175310 ]

Pass the real oemcrypto session id from `pair.session` instead of
`session` for LoadEntitledContentKeys, since `session` can be
changed when L1 and L3 are running in parallel and `session` in
that case may not be the correct oemcrypto session id any more.

Bug: 279967915, 282180589
Test: wvts
Change-Id: I127ff37abf8b618dfbcb623f59bc999e58e7a028
2023-05-15 18:40:21 +00:00
Treehugger Robot
2425732a87 Merge "Update gts/cts helper script with WVTS paths" into udc-dev am: 99b760c857 am: 0536d41235 am: eff669ba73 am: 77558f2f77
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22961195

Change-Id: I5952f85baca58618898f3a69e749bd8ccaf3eb20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-13 10:38:12 +00:00
Treehugger Robot
4b21adc5cf Merge "Update gts/cts helper script with WVTS paths" into udc-dev am: 99b760c857 am: 0536d41235 am: bac69055e1 am: 6964d0bd5e
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22961195

Change-Id: I920cec32548f505962165a113202f737df670030
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-13 10:37:53 +00:00
Treehugger Robot
77558f2f77 Merge "Update gts/cts helper script with WVTS paths" into udc-dev am: 99b760c857 am: 0536d41235 am: eff669ba73
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22961195

Change-Id: I15d1ddbbb9af84bad0c1c6d704f1eca3810e73c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-13 10:37:26 +00:00
Treehugger Robot
648e70df81 Merge "Update gts/cts helper script with WVTS paths" into udc-dev am: 99b760c857 am: c48df4a8db am: 793ec7823d am: d4a7cb9fc6
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22961195

Change-Id: I8ade9150b59a48fd9a1e2a347cacb73ebcee0a3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-13 10:37:15 +00:00
Treehugger Robot
6964d0bd5e Merge "Update gts/cts helper script with WVTS paths" into udc-dev am: 99b760c857 am: 0536d41235 am: bac69055e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22961195

Change-Id: I535e6a6291a788c8edde921a93c52a04e4f5a5a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-13 10:08:04 +00:00
Treehugger Robot
d4a7cb9fc6 Merge "Update gts/cts helper script with WVTS paths" into udc-dev am: 99b760c857 am: c48df4a8db am: 793ec7823d
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22961195

Change-Id: I4a8881820ffe5762e11a9d4b0f1c0e7df9273ea2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-13 10:07:47 +00:00
Treehugger Robot
eff669ba73 Merge "Update gts/cts helper script with WVTS paths" into udc-dev am: 99b760c857 am: 0536d41235
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22961195

Change-Id: Iedeb2aae3101da8dedb921a6c192f1637b887569
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-13 09:53:22 +00:00
Treehugger Robot
bac69055e1 Merge "Update gts/cts helper script with WVTS paths" into udc-dev am: 99b760c857 am: 0536d41235
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22961195

Change-Id: I20a127b8b6fb223d30022607fbebd1ad21d2f2f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-13 09:49:20 +00:00
Treehugger Robot
f83700273d Merge "Update gts/cts helper script with WVTS paths" into udc-dev am: 99b760c857 am: 8485b9a3d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22961195

Change-Id: Iab36e3e345589d8c795d1414fa27775f4fc3523f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-13 09:49:19 +00:00
Treehugger Robot
793ec7823d Merge "Update gts/cts helper script with WVTS paths" into udc-dev am: 99b760c857 am: c48df4a8db
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22961195

Change-Id: I11ae3e718b6c25ebdd6f300717bc2135fb3ce258
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-13 09:33:37 +00:00
Treehugger Robot
0536d41235 Merge "Update gts/cts helper script with WVTS paths" into udc-dev am: 99b760c857
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22961195

Change-Id: Ic1bcc8fae79ebbdaca086198f6253bb6330412d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-13 09:12:53 +00:00
Treehugger Robot
8485b9a3d2 Merge "Update gts/cts helper script with WVTS paths" into udc-dev am: 99b760c857
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22961195

Change-Id: I6ae24bfa8f597e99e7ec4f60bac73a8dd373d6c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-13 09:12:51 +00:00
Treehugger Robot
c48df4a8db Merge "Update gts/cts helper script with WVTS paths" into udc-dev am: 99b760c857
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22961195

Change-Id: I6903d4b21a9bc2dfa7e96ab9f9b4e97ccb902829
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-13 09:08:45 +00:00
Treehugger Robot
99b760c857 Merge "Update gts/cts helper script with WVTS paths" into udc-dev 2023-05-13 08:13:55 +00:00
Rahul Frias
6dabea4c55 Merge changes I5cbfcc73,I3070b3f3 into udc-dev am: 75c1b88603 am: 486c57f783 am: eb72b1dfe4 am: f0366e9671
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23094536

Change-Id: I7420e1ecbe4b6a767e91b28f747396ce78d6b3c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-13 06:27:40 +00:00
Treehugger Robot
7f232255c5 Merge "Fix oec session id in dynamic adpater" into udc-dev am: 81cb2ba955 am: 6ee8154438 am: 5f5089dd13 am: cd4af854fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23218888

Change-Id: I5e74b109afae844bffbcd2ec08a2b7a695d206b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-13 06:27:33 +00:00
Rahul Frias
2c5a3b2874 Merge changes I5cbfcc73,I3070b3f3 into udc-dev am: 75c1b88603 am: 3065ca84a8 am: db72a16017 am: 3bfc19bbcb
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23094536

Change-Id: Ibb9e0911ee8aad7ca51b0b7a1042546102f3871e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-13 06:27:25 +00:00
Treehugger Robot
328e42105f Merge "Fix oec session id in dynamic adpater" into udc-dev am: 81cb2ba955 am: 117fd709c7 am: 61865b00d8 am: 683eb5a322
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23218888

Change-Id: I5b3b53bd9e848a48860cd012ae419764d070ac9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-13 06:27:17 +00:00