Commit Graph

7348 Commits

Author SHA1 Message Date
Treehugger Robot
2b9c29d110 Merge "Correct stability issues for SPOIDs for provisioning 4.0" into udc-qpr-dev am: 05f045d802
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/24537206

Change-Id: Ifd57483a874109b90736654f021f6bbcd3422f0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 21:11:08 +00:00
Treehugger Robot
05f045d802 Merge "Correct stability issues for SPOIDs for provisioning 4.0" into udc-qpr-dev 2023-09-20 20:15:28 +00:00
Rahul Frias
2f83cd0e49 Correct stability issues for SPOIDs for provisioning 4.0
[ Merge of http://go/wvgerrit/183472 ]

For provisioning 4.0 devices, the DRM certificate serial number
was changing on a reprovisioning attempt or factory reset. The
app parameters sent up in the client identification name-value
pair field were being filtered out in provisioning requests.
This has been corrected for provisioning 4.0 stage 2
(DRM certificate request). There is no need to include them for
stage 1 (OEM certificate request).

The test case WvCdmRequestLicenseTest.ProvisioningSpoidTest
was created earlier to ensure that SPOIDs and DRM certificates are
stable. Unfortunately due to another bug b/250099615, the RKP service
was holding a connection to the Widevine TA for provisioning 4.0
devices. When native tests ran as their own process, L1 would fail
to load due to a connection failure and the test would run as L3.
The tests passed for provisioning 4.0 devices Pixel 7 and 8 when
they should have failed. This gave us a false sense of confidence
that the SPOIDs were stable.

For now a workaround is to run a shell command to kill the widevine
TA before running native tests.

$ adb shell pkill -f -9 widevine

New tests have been introduced to provide integration coverage
WVPluginTest at the WV plugin level and CoreIntegrationTest
for core. GTS tests are also being written in b/295538002.

Bug: 294451432
Bug: 293950895
Test: WVPluginTest.ProvisioningStableSpoidTestL1, WVTS tests
Change-Id: Ib9ace4387866ea38bb1840feb69cea78d2d2c09c
2023-09-19 09:39:13 -07:00
Kyle Zhang
20f11d31db Merge "Drop Widevine CDM v17 prebuilt files" into udc-qpr-dev am: 50b61a6d15
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/24578415

Change-Id: I38d337324edd40f5d992bc0c39f51989883894e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31 00:08:49 +00:00
Kyle Zhang
50b61a6d15 Merge "Drop Widevine CDM v17 prebuilt files" into udc-qpr-dev 2023-08-30 23:08:25 +00:00
Robert Shih
0734bab945 Update Widevine apex min_sdk_version to 34 am: d81cdbae42
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/24326594

Change-Id: I1b3f34c9d89bd7331c3de850c9895ab03b7c92e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-30 20:10:38 +00:00
Kyle Zhang
dfed5db616 Drop Widevine CDM v17 prebuilt files
The following files have been updated as part of this change:

libwvdrmengine/prebuilt/v17/android.hardware.drm-service.widevine

Built here: ab/P61807725

The change is generated with prebuilt drop tool.

Bug: 297297678
Test: com.google.android.wvts
Change-Id: I1d91131c16a044aa4f3aad0afc2857fb74182851
2023-08-30 04:36:15 +00:00
Robert Shih
d81cdbae42 Update Widevine apex min_sdk_version to 34
Bug: 287567070
Bug: 294568360
Test: v2/widevine-eng/drm_compliance_apex
Change-Id: Iad45bf7a66ff0217724376aa8648ecd613af32c1
2023-08-28 12:30:36 -07:00
Kyle Zhang
52dcea6955 Drop Widevine CDM v17 prebuilt files am: 9c6f96d87c
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/24486319

Change-Id: I53d1fa2257ef82c24d7e412290731db92ba03300
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 23:56:27 +00:00
Kyle Zhang
9c6f96d87c Drop Widevine CDM v17 prebuilt files
The following files have been updated as part of this change:

libwvdrmengine/prebuilt/v17/android.hardware.drm-service.widevine

Built here: ab/P61073747

The change is generated with prebuilt drop tool.

Bug: 291139517
Test: com.google.android.wvts.MediaDrmParameterizedTests#testValidateMetrics[L1] and 3
Change-Id: I66e2c03ba226c6404ee0c92ab84e07f187a20b32
2023-08-18 23:03:33 +00:00
Treehugger Robot
c81b7c2419 Merge "Add dumping provision request functionality" into udc-qpr-dev am: be8b64a4e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/24269065

Change-Id: Iad28bf04dbe46eac2fad9e75a2859f6d81cd52e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 23:25:57 +00:00
Treehugger Robot
be8b64a4e6 Merge "Add dumping provision request functionality" into udc-qpr-dev 2023-08-08 22:55:15 +00:00
Alex Dale
1c1066dd39 Merge "Close session during capacity check." into udc-qpr-dev am: 310c028965
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/24310872

Change-Id: Icc7b2935bf5956dd00853caeb67e50d221816984
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-07 22:55:19 +00:00
Alex Dale
310c028965 Merge "Close session during capacity check." into udc-qpr-dev 2023-08-07 22:32:28 +00:00
Alex Dale
75d3ade093 Close session during capacity check.
[ Merge of http://go/wvgerrit/181151 ]
[ Cherry-pick of http://ag/24103737 ]

For devices with a large number of usage entries, when restoring the
usage table a capacity check is performed.  This checks that a new
entry can be created.  This test was originally added as some devices
might enter a "stuck" state the table cannot be initialized.

To perform this test, a temporary crypto session is created and an
entry is created for that session.  After successfully creating that
entry, the entry is deleted.  However, because the session was left
open, the entry could not be deleted.

This change closes the capacity-check-session before deleting the
entry, as well as includes additional logs for helping future debugs.

Bug: 286176947
Bug: 291351287
Test: usage_table_header_unittest
Test: Android GTS R11 on oriole
Change-Id: I6923de00175f70b2392bfe581ca5f9ae60c4af25
(cherry picked from commit 8b4bbeeb6f440c48a3250b961f7a7dab2472d7e9)
(cherry picked from commit bb925c46e5)
2023-08-07 20:50:18 +00:00
Alex Dale
8e0db60e5c Add HDCP cap logging on HDCP-based failures. am: 3ea91f35dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/24314234

Change-Id: I9922ade447d574ce02f0a21fc9a47f526c83b3c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-07 18:24:14 +00:00
Alex Dale
3ea91f35dd Add HDCP cap logging on HDCP-based failures.
[ Merge of http://go/wvgerrit/181152 ]
[ Cherry-pick of http://ag/24137228 ]

Partners have requested that we log HDCP information during certain
operation:
1) Current and max HDCP capability when calls to decrypt or select
   key failure due to insufficient or mixed HDCP levels.
2) Current, desired and default HDCP level when video contraints
   are not met.

To avoid spamming the logs, decrypt failures are only logged on their
first occurrence, and unmet video constrains when one of the
requirements change.

Bug: 276686656
Bug: 292005982
Test: license_keys_unittest
Test: Android WVTS on oriole
Change-Id: I98b18e66d7ce1c474a018ae83af4f1c0b03308df
(cherry picked from commit c84b9afd38)
2023-08-05 09:21:50 +00:00
Kyle Zhang
81a63e05ae Add dumping provision request functionality
[ Merge of http://go/wvgerrit/179590 ]

Bug: 277788529
Test: dumpsys android.hardware.drm.IDrmFactory/widevine -prov
Change-Id: Ife88d1323bf5ee423eb8827ca324b73db3cc984a
(cherry picked from commit afbfe173a8)
2023-07-31 19:32:08 +00:00
Robert Shih
e391af47e4 WVDrmPlugin: expose processorWidth am: d655ffbfe7
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23834436

Change-Id: I8a19e6147e16c647a5d740c7c8f06035b73b9fc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 09:07:09 +00:00
Robert Shih
d655ffbfe7 WVDrmPlugin: expose processorWidth
[ Merge of go/wvgerrit/c/cdm/+/177750 ]

Bug: 287093494
Test: MediaDrmParameterizedTests#testDrmPropertyStrings
Change-Id: I6d616deb69e6313c031bb3294ec3fcf62cabbacb
2023-06-29 08:22:26 +00:00
Cong Lin
3140bdd9f9 Fix a few Vts failures in factory_upload_tool am: 2caa832158
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23753310

Change-Id: Id5bc17f2c2c690862afdc873cb10dec919bbc56b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 23:23:56 +00:00
Cong Lin
2caa832158 Fix a few Vts failures in factory_upload_tool
1. Fix getHardwareInfo
2. Allow unused param to be empty
3. Deprecate generateCertificateRequestV1
4. Update Wv IRPC Hal version to 3

Test: run VtsHalRemotelyProvisionedComponentTargetTest
Test: vts_treble_vintf_vendor_test.DeviceManifest SingleAidlTest
Bug: 285527325
Bug: 285289790
Change-Id: Id4080e8630d01ad5540f49ae0d13b707e541b36a
2023-06-23 13:52:45 -07:00
Kyle Zhang
8d2b7084e4 Drop Widevine apex prebuilt files to android source tree. am: a1d7a42cf6 am: 28012d50f0 am: b19b3cdacc
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23479543

Change-Id: I1ebeda7e6e993dc99a2038ee49a69a6aaa497ccc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 01:55:38 +00:00
Kyle Zhang
5b454633d6 Drop Widevine apex prebuilt files to android source tree. am: a1d7a42cf6 am: 1932715fa6 am: 2ad416b9bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23479543

Change-Id: Ia340b4472716bb27cc8ef0d6332ed3ba0a13cd50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 01:28:27 +00:00
Kyle Zhang
1d3e3e53b9 Drop Widevine apex prebuilt files to android source tree. am: a1d7a42cf6 am: 28012d50f0 am: a5d67d9033
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23479543

Change-Id: Id61b6e95078045334bc276bcf3aef00c00f6bc7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 01:28:09 +00:00
Kyle Zhang
2ad416b9bf Drop Widevine apex prebuilt files to android source tree. am: a1d7a42cf6 am: 1932715fa6
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23479543

Change-Id: I970e18758061fc248199fff48f705596e273bed5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 01:09:47 +00:00
Kyle Zhang
b19b3cdacc Drop Widevine apex prebuilt files to android source tree. am: a1d7a42cf6 am: 28012d50f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23479543

Change-Id: I2b3df520c8a2d05f924c22cc685d2e738093cee5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 01:09:29 +00:00
Kyle Zhang
a5d67d9033 Drop Widevine apex prebuilt files to android source tree. am: a1d7a42cf6 am: 28012d50f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23479543

Change-Id: I9f251ed48dfa9a6dd62c66fdf2b32a3d2795252c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 01:05:26 +00:00
Kyle Zhang
28012d50f0 Drop Widevine apex prebuilt files to android source tree. am: a1d7a42cf6
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23479543

Change-Id: I34d61177c9406dfb5da18fe806dde9bc92cc6c75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 00:25:47 +00:00
Kyle Zhang
1932715fa6 Drop Widevine apex prebuilt files to android source tree. am: a1d7a42cf6
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23479543

Change-Id: I41694b6219cdacfd232851c4cc6bd58e05ef0913
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 00:21:10 +00:00
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
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
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
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
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
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
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