Commit Graph

3262 Commits

Author SHA1 Message Date
Ling-Yu Lee
3a87988181 Add GMScore into allow list to invoke signRSA API.
Purpose: Moving cast auth into GMScore.
Deisign doc: go/gtv-cast-auth

Bug: b/318467776
Test: Manual
Change-Id: Ic18188dfa61df0d64c1b19fddc99abe851f8b724
2024-01-26 00:17:03 +00:00
Kyle Alexander
163db3777f Remove unnecessary test dependency on libmedia_omx
Test: ./build_and_run_all_unit_tests.sh

Bug: 312063280
Change-Id: Id8c8c4d3d778599c4c418b667497ff7f50f8152e
2023-12-21 20:55:58 +00:00
Kyle Zhang
6b60fc3a76 Add property to check if user forces L3
[ Merge of go/wvgerrit/186611 ]

Android user can set the property using the developer option.

Bug: 301669353
Change-Id: I730b635f6cc28dfb0471c1d679627c94b9e16af1
2023-11-09 19:59:46 +00:00
Kyle Zhang
45d8b38b43 Do not fall back to L3 if L1 has test keybox
[ Merged of go/wvgerrit/186370 ]

CDM by default allows test keybox from device side.

Bug: 299987160
Bug: 301669353
Change-Id: I06f1936ccd068eb71364a5a8931970954233b686
2023-11-09 00:26:17 +00:00
Treehugger Robot
c1f65ff88a Merge "Add package name for build flag" into main 2023-10-26 21:36:55 +00:00
Kyle Zhang
8661efab13 Add package name for build flag
Bug: 303466154
Change-Id: Ia48e9ca2da6d0d17179998200e0ebdb238a4d217
2023-10-25 21:46:30 +00:00
Kyle Zhang
f74a5e6637 Drop Widevine apex prebuilt files wv_341113000
The following files have been updated as part of this change:

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

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

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

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

libwvdrmengine/apex/prebuilt/com.google.android.widevine.lazy.apks[standalones/standalone-arm64_v8a.apex]
package: name=com.google.android.widevine.lazy
versionCode=341113000
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=341113000
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=341113000
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=341113000
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=34
compileSdkVersionCodename=UpsideDownCake
sdkVersion:34
targetSdkVersion:34

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

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

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

libwvdrmengine/apex/prebuilt/com.google.android.widevine.nonupdatable-wv_341113000.apks[standalones/standalone-x86_64.apex]
package: name=com.google.android.widevine.nonupdatable
versionCode=341113000
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=341113000
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=341113000
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=341113000
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=341113000
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=34
compileSdkVersionCodename=UpsideDownCake
sdkVersion:34
targetSdkVersion:34

Built here: ab/10842987

The change is generated with prebuilt drop tool.

Change-Id: I01e646c5524aaf254c8ed7353e74243d8fd4480c
2023-10-25 21:44:30 +00:00
Kyle Zhang
51bbffd87e 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/10868711

The change is generated with prebuilt drop tool.

Bug: 300303634
Change-Id: I7477f3c4efaecc0b56fbcf27b37653f3462a605c
2023-10-02 18:01:31 +00:00
Treehugger Robot
d9b24af07f Merge "Correct stability issues for SPOIDs for provisioning 4.0" into udc-qpr-dev am: 05f045d802 am: 2b9c29d110
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/24537206

Change-Id: I718342725a8025d4e1f6e6d2ec547a4b0e600cf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 22:07:10 +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
302c09e555 Sign nonupdatable widevine apex with its dev key
Bug: 299149538
Change-Id: Ic99838e4e8410b92bcef2bb88da4d64841546819
2023-09-06 21:20:46 +00:00
Kyle Zhang
27d51ad769 Merge "Drop Widevine CDM v17 prebuilt files" into udc-qpr-dev am: 50b61a6d15 am: 20f11d31db
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/24578415

Change-Id: Ia75918291346fa5f02bef264e1603647f26b7cd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31 01:03:01 +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
d2ae81db2a Update Widevine apex min_sdk_version to 34 am: d81cdbae42 am: 0734bab945
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/24326594

Change-Id: Ia18fc314eaa00fa7a4bdc8e58d624b667680e896
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-30 21:03:01 +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
9a12053a16 Drop Widevine CDM v17 prebuilt files am: 9c6f96d87c am: 52dcea6955
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/24486319

Change-Id: Ic8dfef971f1a21f29331e7b18c24cce04bf8071d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22 01:12:11 +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
f1ddbe71f5 Merge "Add dumping provision request functionality" into udc-qpr-dev am: be8b64a4e6 am: c81b7c2419
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/24269065

Change-Id: I1ac0f04af57b7438c8289065595e0b04e38dda88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 23:49:44 +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
729f81217c Merge "Close session during capacity check." into udc-qpr-dev am: 310c028965 am: 1c1066dd39
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/24310872

Change-Id: Ieb868f5696966e934f8bf2796d468704ea1f3dd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-07 23:41:30 +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
10a31ccf3c Add HDCP cap logging on HDCP-based failures. am: 3ea91f35dd am: 8e0db60e5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/24314234

Change-Id: Ie69c63fd9e8c59807fef097a8e137e7ba07f296d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-07 19:09:58 +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
4597bf8a3c WVDrmPlugin: expose processorWidth am: d655ffbfe7 am: e391af47e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23834436

Change-Id: I18d386594b4294e7dbbc69110873d6e2ec1c2cf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 09:50:51 +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
b534ae59d1 Fix a few Vts failures in factory_upload_tool am: 2caa832158 am: 3140bdd9f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23753310

Change-Id: Ia7efe805e82b050a38bef3a5e271d0637639a5d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-24 00:07:42 +00:00
Pawan Wagh
5dab69064a Merge "Disable leak detection in widevine aidl fuzzer" 2023-06-23 22:13:13 +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
5dcda4f4f8 Drop Widevine apex prebuilt files to android source tree. am: a1d7a42cf6 am: fe1f5f77c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23479543

Change-Id: I3478cbb3bf1a61b091fcaa311bede82f235c7598
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 01:05:34 +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
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
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
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
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
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
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
99b760c857 Merge "Update gts/cts helper script with WVTS paths" into udc-dev 2023-05-13 08:13:55 +00:00
Rahul Frias
1fbaded0f8 Merge changes I5cbfcc73,I3070b3f3 into udc-dev am: 75c1b88603 am: baa6824d9a
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23094536

Change-Id: I24032e5564998d45043d2a1fe2627fcf0b719c54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-13 05:18:19 +00:00
Treehugger Robot
234b58cec7 Merge "Fix oec session id in dynamic adpater" into udc-dev am: 81cb2ba955 am: 90269c3633
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23218888

Change-Id: I5c0cd405cbcb34592a814086a439e5d9f7298bb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-13 05:18:11 +00:00
Rahul Frias
75c1b88603 Merge changes I5cbfcc73,I3070b3f3 into udc-dev
* changes:
  Indicate support for initial_renewal_delay_base
  Fixes for renew on license load
2023-05-13 04:08:22 +00:00
Treehugger Robot
81cb2ba955 Merge "Fix oec session id in dynamic adpater" into udc-dev 2023-05-13 03:59:16 +00:00
Jooyung Han
6dc6d87624 Fix build_test breakage am: 5a6c57b11a am: ccb93ea4b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23213877

Change-Id: Ic31362276d4aaa8b06e7b5e3a4266319fb225f12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-13 01:26:55 +00:00
Jooyung Han
5a6c57b11a Fix build_test breakage
CI build_test target tests every product, which invokes the new
widevine_generic product out of the build script. This makes build fail
due to the missing TARGET_BASE_PRODUCT.

Fix it by fallback to module_arm as base product.

Bug: 281617982
Test: TH
Change-Id: I36d437a56609865e64aea86c5d3af02887b42bc7
2023-05-13 07:34:07 +09:00
Rahul Frias
0c288c1cda Indicate support for initial_renewal_delay_base
[ Merge of http://go/wvgerrit/174555 ]

This is only announced if OEMCrypto is v18+

Bug: 278751387
Test: Duration use case tests, wvts tests
Change-Id: I5cbfcc733ed2af2c940fde381b40a5be850e7e88
2023-05-12 15:05:44 -07:00
Rahul Frias
669fc9c7af Fixes for renew on license load
[ Merge of http://go/wvgerrit/173290 ]

* Renew timer offset from when license is loaded verifies that the
  rental duration has not expired and begins decryption.
* Renew timer offset from first decrypt bugfix
* Feature is enabled based on oemcrypto v18 presence
* Renewal logic verifies that |can_renew| is enabled
* Unit tests were added to reflect use cases from duration
  and renewal documentation

Bug: 278751387
Test: policy unittests, CdmUseCase tests, wvts tests
Change-Id: I3070b3f31b316e150c28ebe38d0440ab1eeb89b9
2023-05-12 15:02:32 -07:00