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

7486 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Dale
e4593c5836 Merge "Added metrics history for WV CDM for Android." into udc-dev am: b5a7412675 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22794476

Change-Id: Iaac091db712fa3e0069179bb6779407cf4c14967
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 00:07:32 +00:00
Alex Dale
30a7e4e41a Merge "Added metrics history for WV CDM for Android." into udc-dev am: b5a7412675 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22794476

Change-Id: I52dd951e7ebdd8252151feeb0754d8386796fcfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 00:03:20 +00:00
Alex Dale
b5a7412675 Merge "Added metrics history for WV CDM for Android." into udc-dev 2023-04-28 23:39:33 +00:00
Rahul Frias
9d1c9ca76a Add error details when offline license is not found 
[ Merge of http://go/wvgerrit/171310 ]

Offline license not found errors are identified by CdmResponseEnum
347 (KEYSET_ID_NOT_FOUND_4). No addition file system information
is shared.

Checks for file existance use the stat command. The stat call can
return error codes from errno.h when the command fails.
These are now converted into sub error codes and returned along with
the offline license file not found error.

This also includes a change to log stat errors other than
ENOENT (no such file or directory) as a warning rather than verbose.

Bug: 276225520
Test: file_store_unittest, file_utils_unittest, GtsMediaTestCases
Change-Id: Ic09d036549582cd65783b49fa96ffefc4bf562c7
 2023-04-28 02:38:35 -07:00
Kyle Zhang
1aed4f6cdb Merge "Fix prebuilt apexes" into udc-dev am: 5409567ef9 am: b4bf3eca79 am: 0f1b379d90 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22787524

Change-Id: I7ad9165cf79ba0123af703f9b8713bb09f974e9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 00:35:57 +00:00
Kyle Zhang
40a91e9f4b Merge "Create different targets for each Widevine apex" into udc-dev am: c01cd91d92 am: b0c01b626f am: 9bcb153d53 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22604302

Change-Id: I03b2d9e26c09f5c7a5251748f3c4c8828e4b3616
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 00:35:53 +00:00
Kyle Zhang
e81e7fb950 Merge "Fix prebuilt apexes" into udc-dev am: 5409567ef9 am: 17d8250be7 am: 821e12e359 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22787524

Change-Id: I3516375adceb2b843027c53fbc19e270591b76e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 00:20:24 +00:00
Kyle Zhang
5b25a3c618 Merge "Create different targets for each Widevine apex" into udc-dev am: c01cd91d92 am: 7377a5d5fd am: 7897f6d232 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22604302

Change-Id: I4557207c508b8ef9b21a8d4e4dc1b48d3b75fe4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 00:20:18 +00:00
Kyle Zhang
0f1b379d90 Merge "Fix prebuilt apexes" into udc-dev am: 5409567ef9 am: b4bf3eca79 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22787524

Change-Id: I3a6ce55292f5d18faa6111b613782bb11e6adf7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 22:51:15 +00:00
Kyle Zhang
9bcb153d53 Merge "Create different targets for each Widevine apex" into udc-dev am: c01cd91d92 am: b0c01b626f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22604302

Change-Id: I4a62eea4ce26431ef5eb8a2c68635a812cff3653
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 22:50:49 +00:00
Kyle Zhang
821e12e359 Merge "Fix prebuilt apexes" into udc-dev am: 5409567ef9 am: 17d8250be7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22787524

Change-Id: I8da67a81cb392a22fdfecc7cc57e77c2e839e945
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 22:47:55 +00:00
Kyle Zhang
7897f6d232 Merge "Create different targets for each Widevine apex" into udc-dev am: c01cd91d92 am: 7377a5d5fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22604302

Change-Id: I0bae2dd9857cfda761664c9dbf6ffca5365fde08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 22:47:50 +00:00
Kyle Zhang
fa7062e2c1 Merge "Fix prebuilt apexes" into udc-dev am: 5409567ef9 am: 0ef103b048 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22787524

Change-Id: Ie325ed43cbc9f476c37cd641417182b65797deec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 22:45:43 +00:00
Kyle Zhang
2c0eff8b38 Merge "Create different targets for each Widevine apex" into udc-dev am: c01cd91d92 am: 7d3b62c8f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22604302

Change-Id: I00c93833499f31682a5ac1d5825185e3c5d85699
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 22:45:39 +00:00
Alex Dale
4b267e37f9 Allow metrics history to outlive the Android CDM. 
[ Merge of http://go/wvgerrit/172910 ]

The lifecycle of the Android CDM is controlled by Android's strong/
weak pointer functionality.  Unfortunately, it does not provide an
easily predictable point in the code where the CDM is to be deleted
along with the saved metrics.  In order to allow the CDM to keep a
list of metrics that are persistent with the life of the service, a
global thread safe queue is provided which is created when the first
CDM is created, but will out live the CDM.

The metrics will still be deleted when the DRM service is terminated.

Bug: 270166158
Test: adb shell dumpsys android.hardware.drm.IDrmFactory/widevine -m
Change-Id: Id98676d8b5278798b4de332cc272cd5b85024244
 2023-04-27 15:31:39 -07:00
Kyle Zhang
17d8250be7 Merge "Fix prebuilt apexes" into udc-dev am: 5409567ef9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22787524

Change-Id: I8d56ed62c9e7d80cfc0bf1a955fd78441ce2f512
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 22:01:46 +00:00
Kyle Zhang
7377a5d5fd Merge "Create different targets for each Widevine apex" into udc-dev am: c01cd91d92 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22604302

Change-Id: I73e138c6497227e1f4cc7609d149f016fa9da245
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 22:01:40 +00:00
Kyle Zhang
b4bf3eca79 Merge "Fix prebuilt apexes" into udc-dev am: 5409567ef9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22787524

Change-Id: I121b770abd7a3a5340cefca7c45d800656ded4b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 22:01:31 +00:00
Kyle Zhang
b0c01b626f Merge "Create different targets for each Widevine apex" into udc-dev am: c01cd91d92 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22604302

Change-Id: Ic43da161a9098b9907029deea70a75198a294dfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 22:01:29 +00:00
Kyle Zhang
0ef103b048 Merge "Fix prebuilt apexes" into udc-dev am: 5409567ef9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22787524

Change-Id: Icadda8c3544429b4a62dd5f2a0bab5e63a7eaccb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 22:00:20 +00:00
Kyle Zhang
7d3b62c8f6 Merge "Create different targets for each Widevine apex" into udc-dev am: c01cd91d92 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22604302

Change-Id: Idc1db8960465c991ac6f4d91492191afdd8db70a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 22:00:16 +00:00
Alex Dale
666e26284f Include metric history in dumpsys. 
[ Merge of http://go/wvgerrit/171470 ]

Dumping the DRM plugin metrics will now include any saved instances of
the CDM metrics that may be available.

Bug: 239462891
Bug: 270166158
Test: adb shell dumpsys android.hardware.drm.IDrmFactory/widevine -m
Test: atest GtsMediaTestCases
Change-Id: I24d3e0771b50fd20212568a7fd5654691ae51f93
 2023-04-27 14:54:17 -07:00
Alex Dale
c42627a23e Added metrics history for WV CDM for Android. 
[ Merge of http://go/wvgerrit/171271 ]

There is a need to maintain a short history of metrics from CDMs which
have been deleted.  This CL adds this ability to the Android version
of the WV CDM.  The history cannot yet be maintained for long, as the
WV CDM instance is destroyed if unused.

Further changes are required to the plugin to maintain the history
beyond the life-cycle of the CDM instance, and to properly format
its output.

Bug: 239462891
Bug: 270166158
Test: adb shell dumpsys android.hardware.drm.IDrmFactory/widevine -m
Test: atest GtsMediaTestCases
Change-Id: I81c0996602722a9795fc3951030d20bb39b5816b
 2023-04-27 14:54:17 -07:00
Kyle Zhang
5409567ef9 Merge "Fix prebuilt apexes" into udc-dev 2023-04-27 21:21:11 +00:00
Kyle Zhang
c01cd91d92 Merge "Create different targets for each Widevine apex" into udc-dev 2023-04-27 21:21:11 +00:00
Cong Lin
b15b3f0a59 Add BccParser to internal factory upload tool am: 5ce29c42da am: 3a14535bb1 am: 181d11105c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22881149

Change-Id: I0f5a46f21083f36b209cc829073f6d3c4a597d83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 00:57:43 +00:00
Cong Lin
14fa41acb1 Add BccParser to internal factory upload tool am: 5ce29c42da am: 5232dda438 am: eefc85b404 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22881149

Change-Id: I18a1dccfd7749b7161e245776f2f6f9fc4963850
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 00:52:20 +00:00
Cong Lin
181d11105c Add BccParser to internal factory upload tool am: 5ce29c42da am: 3a14535bb1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22881149

Change-Id: I43a33f793e480d97052909ff63db0c4f05d3752f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 00:40:35 +00:00
Cong Lin
eefc85b404 Add BccParser to internal factory upload tool am: 5ce29c42da am: 5232dda438 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22881149

Change-Id: Ie7231fcdfa150ab0f01aa6ab2543649ae9af7065
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 00:31:43 +00:00
Cong Lin
21e7d1c2ab Add BccParser to internal factory upload tool am: 5ce29c42da am: b69acfb612 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22881149

Change-Id: I433b689dc3b2f74aa978d4cd0676079b73694eab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 00:30:36 +00:00
Cong Lin
b69acfb612 Add BccParser to internal factory upload tool am: 5ce29c42da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22881149

Change-Id: I57759862282c52db3850e8d06486e8bd67bfff9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-26 23:53:25 +00:00
Cong Lin
5232dda438 Add BccParser to internal factory upload tool am: 5ce29c42da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22881149

Change-Id: I44190007c85a5a931c3b40f5989e890ced328ca5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-26 23:53:12 +00:00
Cong Lin
3a14535bb1 Add BccParser to internal factory upload tool am: 5ce29c42da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22881149

Change-Id: I1610b14eb0b7cccda1b8c51b48348ab0ec37acfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-26 23:51:09 +00:00
Treehugger Robot
24ae69ee55 Merge "Provide placeholder OEMCrypto file for RISCV" 2023-04-26 18:27:23 +00:00
Cong Lin
5ce29c42da Add BccParser to internal factory upload tool 
Add a Bcc parser which prints the public keys in dice chain and a few
other key properties.

Borrowed code from
https://source.corp.google.com/piper///depot/google3/video/widevine/keysmith/provisioning/provisioning40/boot_certificate_chain_parser.cc
and modified locally to build an executable tool.

Sample output from new pixel device:

ROOT DEVICE PUBLIC KEY:
key encoding format: DEVICE_KEY_OCTET_PAIR
key algorithm type: ECDSA_SHA384
curve: P384
public key bytes: 04de874f6067bde6604b2d7a5d51ad28e6335d4524de4314ba6e594e6c95ccefeb17066a0b2f86b16591815c184694d7c54f02549e390e98e9e244e9cd73e616ffd9160371936b7c57e42617a3b497265bc84a0870fae4542e9f35b350383f4ebf

CDI PUBLIC KEY 1:
Issuer: 6a680468c33e5a9a95730632070f76e016f971a9
Subject: 5fbc8ab87c4a23ae660ea38461fea5bbc375a08c
key encoding format: DEVICE_KEY_OCTET_PAIR
key algorithm type: ECDSA_SHA384
curve: P384
public key bytes: 04dfa00e8f96d25400a7824c44a27ba141520629820a7348d48b6fa9b616e6f6793df08288c81985864b07b08fbce4beca3f0297b4b1965be3c26aa493d98ef20f18b2cf2c751ed77b170e04a2a7712f7509b22ac9b504965bd0a963c5947ccc2e

CDI PUBLIC KEY 2:
Issuer: 5fbc8ab87c4a23ae660ea38461fea5bbc375a08c
Subject: 34a2c88d0edfd43663d47357e64280f26ebe5baa
key encoding format: DEVICE_KEY_OCTET_PAIR
key algorithm type: ECDSA_SHA384
curve: P384
public key bytes: 047717658a703114cd4d287162b3d75ff366b0d7dcd330bdab7fe61bcb1d50b2dd897a2ae6e878100839a3a47b966339bbb1220e76af68832035954ba39266563357fae446b734aefdf8b1295db59ac1ee9692841fee0b62b6d32651c817b34116

CDI PUBLIC KEY 3:
Issuer: 34a2c88d0edfd43663d47357e64280f26ebe5baa
Subject: 0b657b3c2448a5e0669953f9d5bdd90b431bbff2
key encoding format: DEVICE_KEY_OCTET_PAIR
key algorithm type: ECDSA_SHA384
curve: P384
public key bytes: 041a11632576b82a1ead43a6744c6601c869dc8cbc519332f588ad79d01754964b595c4f83a7168c0f494715bedefa87cb699df4d41849fe140ab95252e55808908cc02708bc86b4d3a6a0f4dc6c49d138d67a5d3406ae25773ae182972656599c

Test: parse BCC and Dice chain on pixel existing/new devices
Bug: 279688624
Change-Id: Ia77a1d9f8f467992b998549572270da2c56b38b8
 2023-04-26 10:20:16 -07:00
Prashanth Swaminathan
6f16f52e29 Provide placeholder OEMCrypto file for RISCV 
In order to build RISCV targets in internal master, a value must be
supplied to libwvdrmengine to satisfy the build for riscv64. For now,
point the build to the x86_64 file as a workaround.

Change-Id: I632198279586f2ab974aed9daadd72f378e13094
 2023-04-26 07:09:44 -07:00
Cong Lin
6485ada029 Merge "Factory extraction tool: Use device info from OS property when TEE returns empty" into udc-dev am: 9c42689506 am: ce8676dae8 am: 3ededa0edb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22816864

Change-Id: Icc64dd38ff98c9076ece78337d8f5e708bb40f42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-26 04:53:24 +00:00
Cong Lin
f3da766f94 Merge "Factory extraction tool: Use device info from OS property when TEE returns empty" into udc-dev am: 9c42689506 am: fba535cdc2 am: 466c51765b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22816864

Change-Id: I6f15a09bf31fb54cec9fef471e901ffbee202984
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-26 04:50:25 +00:00
Cong Lin
3ededa0edb Merge "Factory extraction tool: Use device info from OS property when TEE returns empty" into udc-dev am: 9c42689506 am: ce8676dae8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22816864

Change-Id: Ic8b80b10a3c8fad150cbadfc3d50e60c69b1c422
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-26 04:12:18 +00:00
Cong Lin
466c51765b Merge "Factory extraction tool: Use device info from OS property when TEE returns empty" into udc-dev am: 9c42689506 am: fba535cdc2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22816864

Change-Id: I08806102fd2d872928789f94741d4e3052c4bcc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-26 04:08:17 +00:00
Cong Lin
cb92ce96f6 Merge "Factory extraction tool: Use device info from OS property when TEE returns empty" into udc-dev am: 9c42689506 am: 7256ccc161 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22816864

Change-Id: Ic167c44103ff37b5c57cb0f0f6ab3719ea69e5bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-26 04:07:39 +00:00
Cong Lin
fba535cdc2 Merge "Factory extraction tool: Use device info from OS property when TEE returns empty" into udc-dev am: 9c42689506 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22816864

Change-Id: I8bb8cef564a18d0c2700d0df1931bbfa8bac682b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-26 03:28:57 +00:00
Cong Lin
7256ccc161 Merge "Factory extraction tool: Use device info from OS property when TEE returns empty" into udc-dev am: 9c42689506 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22816864

Change-Id: Iffe39839c4b5c43e680e6e1ad01fc7276cc7a516
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-26 03:28:46 +00:00
Cong Lin
ce8676dae8 Merge "Factory extraction tool: Use device info from OS property when TEE returns empty" into udc-dev am: 9c42689506 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22816864

Change-Id: I61c7cdbd3e279defc2863e558992a09335cade21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-26 03:26:20 +00:00
Cong Lin
9c42689506 Merge "Factory extraction tool: Use device info from OS property when TEE returns empty" into udc-dev 2023-04-26 02:57:21 +00:00
Kyle Zhang
1979978bdb Merge "Set drm@latest to widevine service NOT apex" into udc-dev am: 6fda7dfc49 am: c0e6867a62 am: 0774f52581 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22655798

Change-Id: I5dfcf76f9b92f893b1df0ce00c6c8429ce81e24c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 22:56:10 +00:00
Cong Lin
b24df677f6 Merge "Use device info from OS property when TEE returns empty" into udc-dev am: 7e3821885b am: a0a5138a23 am: 9f7d27026b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22824076

Change-Id: I9cd0b3f8742392e7d27d66842a2b04b5b9aa421e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 22:55:52 +00:00
Kyle Zhang
3b418d2d72 Merge "Set drm@latest to widevine service NOT apex" into udc-dev am: 6fda7dfc49 am: 836a1f3d58 am: cd0debd0de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22655798

Change-Id: I87adba1d9769088eb88091356275ca9abf8dc8b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 22:52:08 +00:00
Cong Lin
d667a6b311 Merge "Use device info from OS property when TEE returns empty" into udc-dev am: 7e3821885b am: c480c80ac2 am: 90724171f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22824076

Change-Id: Icaf5f79cfff540d3c73deda29865439591dc9862
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 22:51:51 +00:00
Kyle Zhang
9a44708e37 Merge "Set drm@latest to widevine service NOT apex" into udc-dev am: 6fda7dfc49 am: a15cf030ea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22655798

Change-Id: If7bba9c5626fd60e3f8f2fc4fca2de91f3f48d2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 20:20:17 +00:00