Presubmit Automerger Backend
67a2dc4445
[automerger skipped] [automerge] Add mutex to CdmEngine for use of cert_provisioning_. 2p: 491dfe7690 am: 0aef7b0dd2 am: 20441c9b5b -s ours am: 263a86047c -s ours am: dfe7c493de -s ours am: fb319ba5dc -s ours am: 5d89b131a5 -s ours am: ad346225e9 -s ours
...
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 48bfaab32f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21892284
Change-Id: I6a975d5281dd3b99c65e3f230525ab26e4495bd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 00:29:27 +00:00
TreeHugger Robot
9de0edbccf
Merge "Clean up files no longer needed." into udc-dev am: 467e38f10e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22351367
Change-Id: Id6dcb52420b35e07daee5714b840978c91c7b5fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 00:20:10 +00:00
Presubmit Automerger Backend
c2c53d9c2e
[automerger skipped] [automerge] Add mutex to CdmEngine for use of cert_provisioning_. 2p: 491dfe7690 am: 0aef7b0dd2 am: 20441c9b5b -s ours am: 263a86047c -s ours am: b490501324 -s ours am: f1272a7e35 -s ours
...
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 48bfaab32f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21892284
Change-Id: I8536669e6a4374a8fe52f4400f1b4da66392bdb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 00:12:54 +00:00
Alex Dale
4ee6c4f130
[automerger skipped] Add mutex to CdmEngine for use of cert_provisioning_. am: 48bfaab32f am: 8ef7063d37 am: a54e3a924e am: 300491060f -s ours am: 6baaafc851 -s ours
...
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 48bfaab32f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21900046
Change-Id: I9daec58a1c67c0dcae62010d4d4d5eccf4a73cf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 00:02:32 +00:00
Kyle Zhang
52dfe850ad
Merge "Drop Widevine Apex release key signed prebuilts" into udc-dev am: 4d94891fab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22342728
Change-Id: I98bb4a215e5dda0e23c84fc12f53c18f99fb24ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 23:53:00 +00:00
Alex Dale
b93b7a2247
[automerger skipped] Add mutex to CdmEngine for use of cert_provisioning_. am: 48bfaab32f am: 18dce87499 -s ours am: e827a6da8a -s ours
...
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 6e5ab021d8 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21900046
Change-Id: Iefc27a178391d0f600fdc168282736ac59d010da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 23:46:52 +00:00
Alex Dale
3a3bb1ce14
Merge "Android CDM: Restored secure stop tests." into udc-dev am: 9d82b224eb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22294726
Change-Id: I02a9749a4059a12e81d10a471c8141c2e8d5140a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 23:34:52 +00:00
Rahul Frias
4f11544afc
Merge changes I44095261,I30829ad7 into udc-dev am: 98543b50cb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22239717
Change-Id: I608af2dd4de640d563d6a1f388748ce28a86ea14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 23:23:20 +00:00
Presubmit Automerger Backend
ad346225e9
[automerger skipped] [automerge] Add mutex to CdmEngine for use of cert_provisioning_. 2p: 491dfe7690 am: 0aef7b0dd2 am: 20441c9b5b -s ours am: 263a86047c -s ours am: dfe7c493de -s ours am: fb319ba5dc -s ours am: 5d89b131a5 -s ours
...
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 48bfaab32f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21892284
Change-Id: I0c6bd0ef9efa73d3123ed5c5f778c79da3ba58d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 21:55:07 +00:00
TreeHugger Robot
467e38f10e
Merge "Clean up files no longer needed." into udc-dev
2023-03-30 21:22:30 +00:00
Presubmit Automerger Backend
5d89b131a5
[automerger skipped] [automerge] Add mutex to CdmEngine for use of cert_provisioning_. 2p: 491dfe7690 am: 0aef7b0dd2 am: 20441c9b5b -s ours am: 263a86047c -s ours am: dfe7c493de -s ours am: fb319ba5dc -s ours
...
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 48bfaab32f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21892284
Change-Id: I82876d7310cb88edbe2f67c61b46692a720f6e4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 21:11:39 +00:00
Presubmit Automerger Backend
fb319ba5dc
[automerger skipped] [automerge] Add mutex to CdmEngine for use of cert_provisioning_. 2p: 491dfe7690 am: 0aef7b0dd2 am: 20441c9b5b -s ours am: 263a86047c -s ours am: dfe7c493de -s ours
...
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 48bfaab32f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21892284
Change-Id: I6fac25c59bfcb90015d669eb825b190c1adc89e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 20:42:27 +00:00
Presubmit Automerger Backend
f1272a7e35
[automerger skipped] [automerge] Add mutex to CdmEngine for use of cert_provisioning_. 2p: 491dfe7690 am: 0aef7b0dd2 am: 20441c9b5b -s ours am: 263a86047c -s ours am: b490501324 -s ours
...
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 48bfaab32f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21892284
Change-Id: I914bab13a327019958bc7fb1378af790b15bcb9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 20:39:19 +00:00
Presubmit Automerger Backend
dfe7c493de
[automerger skipped] [automerge] Add mutex to CdmEngine for use of cert_provisioning_. 2p: 491dfe7690 am: 0aef7b0dd2 am: 20441c9b5b -s ours am: 263a86047c -s ours
...
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 48bfaab32f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21892284
Change-Id: I8bbaea855ec14d368b5e9492c51fbdf49c759bc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 20:06:43 +00:00
Presubmit Automerger Backend
b490501324
[automerger skipped] [automerge] Add mutex to CdmEngine for use of cert_provisioning_. 2p: 491dfe7690 am: 0aef7b0dd2 am: 20441c9b5b -s ours am: 263a86047c -s ours
...
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 48bfaab32f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21892284
Change-Id: I649d0fb24b0238fb2b0fab1125f34831d0815ea5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 20:06:04 +00:00
Alex Dale
6baaafc851
[automerger skipped] Add mutex to CdmEngine for use of cert_provisioning_. am: 48bfaab32f am: 8ef7063d37 am: a54e3a924e am: 300491060f -s ours
...
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 48bfaab32f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21900046
Change-Id: I8b28d05c3e11c0bac9a8b841b3b7b4f7e657d7f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 19:34:18 +00:00
Presubmit Automerger Backend
263a86047c
[automerger skipped] [automerge] Add mutex to CdmEngine for use of cert_provisioning_. 2p: 491dfe7690 am: 0aef7b0dd2 am: 20441c9b5b -s ours
...
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 48bfaab32f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21892284
Change-Id: Idf333bf485c83ecb1eb9a923701e181191f34c7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 19:13:59 +00:00
Presubmit Automerger Backend
20441c9b5b
[automerge] Add mutex to CdmEngine for use of cert_provisioning_. 2p: 491dfe7690 am: 0aef7b0dd2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21892284
Change-Id: I6a0c0d45198d938ab60cf6faa241254613d5d861
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 18:44:50 +00:00
Kyle Zhang
d210d9d5d1
Clean up files no longer needed.
...
libwvdrmengine/apex/nonupdatable/device.mk is vendor/widevine/libwvdrmengine/apex/device/device-nonupdatable.mk now.
Bug: 251299786
Change-Id: Ibdd315c70ea4ec261f1490d8cd9eacca269105d6
2023-03-30 18:22:46 +00:00
Kyle Zhang
4d94891fab
Merge "Drop Widevine Apex release key signed prebuilts" into udc-dev
2023-03-30 18:11:30 +00:00
Alex Dale
300491060f
Add mutex to CdmEngine for use of cert_provisioning_. am: 48bfaab32f am: 8ef7063d37 am: a54e3a924e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21900046
Change-Id: Ib245efb17abbb864219f006fd008ef2bd9c526f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 17:34:20 +00:00
Alex Dale
e827a6da8a
[automerger skipped] Add mutex to CdmEngine for use of cert_provisioning_. am: 48bfaab32f am: 18dce87499 -s ours
...
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 6e5ab021d8 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21900046
Change-Id: If4f49c6361697b16312f5be4f1ca2988a9674421
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 17:17:46 +00:00
Alex Dale
a54e3a924e
Add mutex to CdmEngine for use of cert_provisioning_. am: 48bfaab32f am: 8ef7063d37
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21900046
Change-Id: Ifd3597f01ea72172065c44cf467248b63372a3f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 17:02:20 +00:00
Alex Dale
8ef7063d37
Add mutex to CdmEngine for use of cert_provisioning_. am: 48bfaab32f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21900046
Change-Id: I016f0cf66e4d90a32d087c0d492cb52bd3392e84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 16:25:19 +00:00
Alex Dale
18dce87499
Add mutex to CdmEngine for use of cert_provisioning_. am: 48bfaab32f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21900046
Change-Id: I9653a720ab006450409ba021c695c9d74947ca61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 16:24:37 +00:00
Alex Dale
9d82b224eb
Merge "Android CDM: Restored secure stop tests." into udc-dev
2023-03-30 06:11:58 +00:00
Kyle Zhang
57a954bc49
Drop Widevine Apex release key signed prebuilts
...
The following files have been updated as part of this change:
libwvdrmengine/apex/prebuilt/com.google.android.widevine.apks[standalones/standalone-arm64_v8a.apex]
package: name=com.google.android.widevine
versionCode=340514000
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=33
compileSdkVersionCodename=UpsideDownCake
sdkVersion:UpsideDownCake
targetSdkVersion:10000
libwvdrmengine/apex/prebuilt/com.google.android.widevine.apks[standalones/standalone-armeabi_v7a.apex]
package: name=com.google.android.widevine
versionCode=340514000
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=33
compileSdkVersionCodename=UpsideDownCake
sdkVersion:UpsideDownCake
targetSdkVersion:10000
libwvdrmengine/apex/prebuilt/com.google.android.widevine.apks[standalones/standalone-x86.apex]
package: name=com.google.android.widevine
versionCode=340514000
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=33
compileSdkVersionCodename=UpsideDownCake
sdkVersion:UpsideDownCake
targetSdkVersion:10000
libwvdrmengine/apex/prebuilt/com.google.android.widevine.apks[standalones/standalone-x86_64.apex]
package: name=com.google.android.widevine
versionCode=340514000
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=33
compileSdkVersionCodename=UpsideDownCake
sdkVersion:UpsideDownCake
targetSdkVersion:10000
libwvdrmengine/apex/prebuilt/com.google.android.widevine.lazy.apks[standalones/standalone-arm64_v8a.apex]
package: name=com.google.android.widevine.lazy
versionCode=340514000
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=33
compileSdkVersionCodename=UpsideDownCake
sdkVersion:UpsideDownCake
targetSdkVersion:10000
libwvdrmengine/apex/prebuilt/com.google.android.widevine.lazy.apks[standalones/standalone-armeabi_v7a.apex]
package: name=com.google.android.widevine.lazy
versionCode=340514000
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=33
compileSdkVersionCodename=UpsideDownCake
sdkVersion:UpsideDownCake
targetSdkVersion:10000
libwvdrmengine/apex/prebuilt/com.google.android.widevine.lazy.apks[standalones/standalone-x86.apex]
package: name=com.google.android.widevine.lazy
versionCode=340514000
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=33
compileSdkVersionCodename=UpsideDownCake
sdkVersion:UpsideDownCake
targetSdkVersion:10000
libwvdrmengine/apex/prebuilt/com.google.android.widevine.lazy.apks[standalones/standalone-x86_64.apex]
package: name=com.google.android.widevine.lazy
versionCode=340514000
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=33
compileSdkVersionCodename=UpsideDownCake
sdkVersion:UpsideDownCake
targetSdkVersion:10000
libwvdrmengine/apex/prebuilt/com.google.android.widevine.nonupdatable.apks[standalones/standalone-arm64_v8a.apex]
package: name=com.google.android.widevine.nonupdatable
versionCode=340514000
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=33
compileSdkVersionCodename=UpsideDownCake
sdkVersion:UpsideDownCake
targetSdkVersion:10000
libwvdrmengine/apex/prebuilt/com.google.android.widevine.nonupdatable.apks[standalones/standalone-armeabi_v7a.apex]
package: name=com.google.android.widevine.nonupdatable
versionCode=340514000
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=33
compileSdkVersionCodename=UpsideDownCake
sdkVersion:UpsideDownCake
targetSdkVersion:10000
libwvdrmengine/apex/prebuilt/com.google.android.widevine.nonupdatable.apks[standalones/standalone-x86.apex]
package: name=com.google.android.widevine.nonupdatable
versionCode=340514000
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=33
compileSdkVersionCodename=UpsideDownCake
sdkVersion:UpsideDownCake
targetSdkVersion:10000
libwvdrmengine/apex/prebuilt/com.google.android.widevine.nonupdatable.apks[standalones/standalone-x86_64.apex]
package: name=com.google.android.widevine.nonupdatable
versionCode=340514000
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=33
compileSdkVersionCodename=UpsideDownCake
sdkVersion:UpsideDownCake
targetSdkVersion:10000
Built here: ab/9842411
The change is generated with prebuilt drop tool.
Bug: 251299786
Change-Id: I741feb00f9b749ad26910c8ee85a256e21d6399f
2023-03-29 23:47:06 +00:00
Rahul Frias
98543b50cb
Merge changes I44095261,I30829ad7 into udc-dev
...
* changes:
Dump BCC on failed provisioning request
Refresh corpus for oemcrypto fuzz tests with modified format
2023-03-29 23:34:40 +00:00
Alex Dale
e928670c85
Android CDM: Restored secure stop tests.
...
[ Semi-revert of http://ag/20183443 ]
[ Merge of http://go/wvgerrit/168898 ]
These tests were removed from Android last quarter; however, they
now need to be restored. These tests will be removed in Android V.
To help with ambiguity around where the CDM is operating on a single
or set of usage info messages, the variables have been renamed to
propery indicate plurality.
Bug: 263319220
Test: cdm_extended_duration_test
Test: request_license_test
Test: libwvdrmdrmplugin_hal_test
Change-Id: I38b16dd5811069fafaeab5ffc19d0f8a8095f0cf
2023-03-28 21:26:06 -07:00
Kyle Zhang
076886fe20
Merge "Integrate apex version info to Widevine CDM property" into udc-dev am: b5ec1ae108
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22105407
Change-Id: I2c16695bc25822abb565fb700afdabf8ab5569f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-28 23:00:50 +00:00
Kyle Zhang
b5ec1ae108
Merge "Integrate apex version info to Widevine CDM property" into udc-dev
2023-03-28 22:31:45 +00:00
Rahul Frias
b3a57e7375
Dump BCC on failed provisioning request
...
[ Merge of http://go/wvgerrit/168357 and http://go/wvgerrit/168177 ]
When we get an error from the provisioning server while
running a test, we should log extra provisioning
information.
Bug: 273990016
Test: GtsMediaTestCases
Change-Id: I44095261e07ae079c632873f254d8e6879bab8c3
2023-03-28 20:28:57 +00:00
Fred Gylys-Colwell
e51bb19296
Refresh corpus for oemcrypto fuzz tests with modified format
...
Merge from Widevine repo of http://go/wvgerrit/165958
and http://go/wvgerrit/165862
Bug: 275264353
Test: test only code
Change-Id: I30829ad72d58e2233f4cc9963d17cb07314b7720
2023-03-28 20:28:57 +00:00
Alex Dale
85997c0ac0
Merge "Fixed test and log formatting for CdmResponseType." into udc-dev am: 5ed89d16e2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22141214
Change-Id: Ib52efd43666b2624b63e41a352b59937985edde0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-28 19:42:41 +00:00
Alex Dale
5ed89d16e2
Merge "Fixed test and log formatting for CdmResponseType." into udc-dev
2023-03-28 19:21:20 +00:00
Cong Lin
3ace58cdaf
Merge "Fix CSR in wv factory upload tool" into udc-dev am: b7280404bd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22294062
Change-Id: I887c673683d3e55813d01a0f9a7ad3f6a3c76e13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-28 18:19:58 +00:00
Kyle Zhang
ce1fb4f089
Integrate apex version info to Widevine CDM property
...
Bug: 272587114
Test: dumpsys android.hardware.drm.IDrmFactory/widevine -p
Change-Id: Ica99867511391c252b67f40162665380bd2d8740
2023-03-28 18:14:02 +00:00
Cong Lin
b7280404bd
Merge "Fix CSR in wv factory upload tool" into udc-dev
2023-03-28 18:02:05 +00:00
Jooyung Han
95b76106f3
Set min_sdk_version for the Widevine APEX am: a4de7eb9b5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22307320
Change-Id: Ia6acded434b5c5b8a1991c2063830545481da971
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-28 17:35:27 +00:00
Jooyung Han
a4de7eb9b5
Set min_sdk_version for the Widevine APEX
...
also remove `use_vndk_as_stable: true` to remove dependency to VNDK
libs.
Bug: 251299786
Test: build WV APEX with V and install it on U device
Change-Id: Ie7f7f9b699119478d4b33f95ab9e6ba7f459346c
2023-03-28 06:57:46 +00:00
Jooyung Han
91496be299
Link dependencies statically am: 81171a7e75
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22302466
Change-Id: I9651e2bbc54e911885e5cb1955653f4d9e397209
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-28 05:53:32 +00:00
Jooyung Han
81171a7e75
Link dependencies statically
...
This reduces the APEX size from 6754304 to 4378624.
Bug: 274818387
Test: m com.google.android.widevine
Test: adb install $OUT/vendor/apex/com.google.android.widevine.apex
Test: adb reboot
Change-Id: Ib31291e5ee35297b9d85120f5eca118ebf10f55f
(cherry picked from commit 78f0b81ece )
2023-03-27 23:43:17 +00:00
Cong Lin
6db1ae5167
Fix CSR in wv factory upload tool
...
Merge of https://widevine-internal-review.googlesource.com/c/cdm/+/169024
The CSR extracted by WV internal BCC extraction tool is missing a
field "unverifiedDeviceInfo". This is required by the RKP's device
uploading tool for the CSR to be accepted.
Also updated the size of the randomly generated challenge from 32 bytes
to 64 bytes, same as what is used by rpk_factory_extraction_tool.
Test: extracted CSR v2 and v3 and dry run uploading
Bug: 275075496
Change-Id: Icc776f810c81ac6589d82935950167925f95f906
2023-03-27 21:10:03 +00:00
Alex Dale
52bd76e0e2
Fixed test and log formatting for CdmResponseType.
...
[ Merge of http://go/wvgerrit/168397 ]
When CdmResponseType (enum) was transformed to CdmResponseType
(struct), the test printers where not updated to print the result
of failed comparisons. In addition, several logs statements were
updated haphazardly, leaving inconsistencies and potential
compiler-specific behavior.
This CL replaces CdmResponseType std::string operator with a ToString()
method. This is to make it consistent with Google's C++ style guide
on conversion operators vs methods. The string conversion function is
now defined in wv_cdm_types.cpp instead of inline in the header file.
The PrintTo function has been implemented along with the other CDM
test printers in test_printers.cpp.
Bug: 273989359
Test: run_x86_64_tests
Test: MediaDrmParameterizedTests on redfin
Test: Forrest drm_compliance
Change-Id: Ibfaa17029046b75b1c8c278f7bd7e04a24379848
2023-03-27 11:21:45 -07:00
Fred Gylys-Colwell
4450b67c36
Remove some names am: bfa8d39a63
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22200007
Change-Id: Iee7d035c851d9892a8c254c7a4e433730b4adc89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-27 04:34:53 +00:00
Fred Gylys-Colwell
bfa8d39a63
Remove some names
...
Merge from Widevine repo of http://go/wvgerrit/168657
Some people who have left were still in OWNERS files and TODOs.
Bug: 274772704
Test: comments only
Change-Id: I583da815586e5ca52316b2e238d1c1bb3a5e919a
2023-03-27 02:45:01 +00:00
Fred Gylys-Colwell
2de79a7ede
Fix logging error type am: ab8c06906a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21649733
Change-Id: I315e84089536f0af41fcea33dee8ece4d2a630e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-24 21:46:21 +00:00
Fred Gylys-Colwell
ab8c06906a
Fix logging error type
...
Merge from Widevine repo of http://go/wvgerrit/166942
The error type is no longer an enumeration.
Bug: 271146682
Change-Id: I64f60fde94d1e8a586128a59f1455041622444b6
2023-03-23 16:23:43 +00:00
Alex Dale
333150ca8b
Avoid null dereference with empty BCC strings. am: ce25b9d44c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22162393
Change-Id: I1afa1444f8127ce1567bf61639bf3602dd6270ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-22 22:22:34 +00:00
Alex Dale
ce25b9d44c
Avoid null dereference with empty BCC strings.
...
[ Merge of http://go/wvgerrit/168482 ]
The function OEMCrypto_GetBootCertificateChain() does not always
provide an additional signature depending on the device. However, the
CDM would still attempt to dereference the first character in the
additional signature buffer when empty. This CL changes how the data
pointer to an output string is acquired. Empty string will instead
pass in a null pointer.
Bug: 272643393
Test: run_prov40_tests
Test: atest GtsMediaTestCases
Change-Id: I10b0a3c7df4fc73272aa701bb01c60672645d4fc
(cherry picked from commit a878e7b98d )
2023-03-20 20:29:58 +00:00