Commit Graph

7259 Commits

Author SHA1 Message Date
Rahul Frias
931781d34c Merge changes Ied664ce8,I90004025 into udc-dev am: 13368f4076 am: 023fd9d026 am: 3feba213eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23088670

Change-Id: Iad9403a42884f0d00072b56f55b57bd018cf0623
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 16:57:59 +00:00
Rahul Frias
07874c2249 Merge changes Ied664ce8,I90004025 into udc-dev am: 13368f4076 am: 023fd9d026 am: 2000288e53
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23088670

Change-Id: If344b78c420b820669c7649c6b62596bcfeff6fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 16:30:55 +00:00
Rahul Frias
a3793b396f Merge changes Ied664ce8,I90004025 into udc-dev am: 13368f4076 am: 4d6352c153 am: 78def13e8d
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23088670

Change-Id: I36c7b67db561bcffbc392aeafcf0ebc845829207
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 16:30:25 +00:00
Rahul Frias
3feba213eb Merge changes Ied664ce8,I90004025 into udc-dev am: 13368f4076 am: 023fd9d026
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23088670

Change-Id: I9beb3c25b088e6a162b660fb7012d4a43716443b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 16:13:06 +00:00
Rahul Frias
2000288e53 Merge changes Ied664ce8,I90004025 into udc-dev am: 13368f4076 am: 023fd9d026
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23088670

Change-Id: I9e7457e44655d93b0154922568206d8dedea19c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 16:11:43 +00:00
Rahul Frias
78def13e8d Merge changes Ied664ce8,I90004025 into udc-dev am: 13368f4076 am: 4d6352c153
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23088670

Change-Id: I63819ac4e72bd9a8899b6694045a1885140ac19e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 15:52:44 +00:00
Rahul Frias
023fd9d026 Merge changes Ied664ce8,I90004025 into udc-dev am: 13368f4076
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23088670

Change-Id: I6768d72e30a2ec12ca579d2555692d833146fb09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 15:31:35 +00:00
Rahul Frias
4d6352c153 Merge changes Ied664ce8,I90004025 into udc-dev am: 13368f4076
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23088670

Change-Id: I618fe84dfd74bd6f0b288c96f2861082bb43db5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 15:27:07 +00:00
Rahul Frias
13368f4076 Merge changes Ied664ce8,I90004025 into udc-dev
* changes:
  Test refactoring to support load on renewal tests
  Fix formatting of renew on license load integration tests
2023-05-12 15:08:16 +00:00
Jooyung Han
93b8d987ac Merge "Add build script for widevine apkset." into udc-dev am: d13f8124ff am: fbaede0920 am: 9f2adca71c
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23157000

Change-Id: I77d98af6e18d614b2c49150460380cfae2a83072
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 10:17:11 +00:00
Jooyung Han
639affa3d1 Merge "Add build script for widevine apkset." into udc-dev am: d13f8124ff am: fbaede0920 am: 70fcf13cac
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23157000

Change-Id: Ifb0ba5aaeff4d85fabb0bed331b4cf7ebb562e02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 09:51:40 +00:00
Jooyung Han
4bae5c24b7 Merge "Add build script for widevine apkset." into udc-dev am: d13f8124ff am: f12b0f6be5 am: 386824c5dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23157000

Change-Id: I62dd7462d90a60c3a3c8bda06fd83b2847ac2cb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 09:50:59 +00:00
Jooyung Han
9f2adca71c Merge "Add build script for widevine apkset." into udc-dev am: d13f8124ff am: fbaede0920
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23157000

Change-Id: I0d0860975cf8bc27690b892c8164af649f79977a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 09:34:12 +00:00
Jooyung Han
70fcf13cac Merge "Add build script for widevine apkset." into udc-dev am: d13f8124ff am: fbaede0920
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23157000

Change-Id: I328f01161679e0e56633cd13307a7182c4edfdb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 09:29:59 +00:00
Jooyung Han
386824c5dd Merge "Add build script for widevine apkset." into udc-dev am: d13f8124ff am: f12b0f6be5
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23157000

Change-Id: I4f4ef37770b912d9db2fb6ad32c273273a308203
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 09:13:55 +00:00
Jooyung Han
fbaede0920 Merge "Add build script for widevine apkset." into udc-dev am: d13f8124ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23157000

Change-Id: I0dcd49214028a32eeeca0f2ecd16ad3ada6a626b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 08:53:25 +00:00
Jooyung Han
f12b0f6be5 Merge "Add build script for widevine apkset." into udc-dev am: d13f8124ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23157000

Change-Id: I72792b50d11d0014f1b52fac14e0820f90ae1ce1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 08:47:36 +00:00
Jooyung Han
d13f8124ff Merge "Add build script for widevine apkset." into udc-dev 2023-05-12 08:14:22 +00:00
Rahul Frias
d50b9031c9 Test refactoring to support load on renewal tests
[ Merge of http://go/wvgerrit/174470 ]

There are two sets of changes
* Mocking CryptoSession so that OEMCrypto API version can be queried
* Creating a PolicyEngineTestV16 so that API version expectations
  can be set and V18 can be accommodated.

Bug: 278751387
Test: policy_engine_unittest
Change-Id: Ied664ce87e22f697b6a45d3c573e22273e65e37f
2023-05-11 16:16:20 -07:00
Alex Dale
03d890f76a Remove duplicate session ID in metrics dump. am: ed81ae2b11 am: 36da43c5f1 am: 47ce6117ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23149071

Change-Id: I5f3f6c3a8cac11220e619c3288bf6198cd39cce7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 21:28:54 +00:00
Alex Dale
90e323b790 Remove duplicate session ID in metrics dump. am: ed81ae2b11 am: 9f585f116c am: 12ac2d7274
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23149071

Change-Id: Ia863dff8c599729cecbe0c2a9e1efc4e4a2f8bc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 21:28:01 +00:00
Alex Dale
324408227a Remove duplicate session ID in metrics dump. am: ed81ae2b11 am: 36da43c5f1 am: 16487b0b80
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23149071

Change-Id: Iddfaf85ad58125c5274ce1fd02830a88c4ba3975
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 21:26:16 +00:00
Alex Dale
47ce6117ef Remove duplicate session ID in metrics dump. am: ed81ae2b11 am: 36da43c5f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23149071

Change-Id: I372c0af8eec7b005d3fe0850d9edf9e383c3a2dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 20:47:04 +00:00
Alex Dale
12ac2d7274 Remove duplicate session ID in metrics dump. am: ed81ae2b11 am: 9f585f116c
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23149071

Change-Id: I8fce13949296d58360806cf6319e59a8c38c5bbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 20:43:57 +00:00
Alex Dale
16487b0b80 Remove duplicate session ID in metrics dump. am: ed81ae2b11 am: 36da43c5f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23149071

Change-Id: I55c6b3cb09d31b141b588b2f2c4a08be06ea561c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 20:39:43 +00:00
Alex Dale
36da43c5f1 Remove duplicate session ID in metrics dump. am: ed81ae2b11
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23149071

Change-Id: If31c40e4512219338d21872ab43ece22be51ac03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 20:04:52 +00:00
Alex Dale
9f585f116c Remove duplicate session ID in metrics dump. am: ed81ae2b11
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23149071

Change-Id: Ia8cf5d59ad77ee007dc29d68e6f89c69cabf5c27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 19:55:48 +00:00
Rahul Frias
f0e546d703 Fix formatting of renew on license load integration tests
[ Merge of http://go/wvgerrit/174270 ]

Bug: 240995342
Test: Duration use case tests
Change-Id: I900040256b4accf2b695a6da0827033eadb4f2e4
2023-05-11 01:52:08 -07:00
Jooyung Han
6808813f46 Add build script for widevine apkset.
This builds Widevine APEXes for every target arch and then build APKS
file signed with devkeys.

Bug: 281617982
Test: DIST_DIR=out/dist UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true \
  TARGET_BUILD_APPS="com.google.android.widevine \
    com.google.android.widevine.nonupdatable \
    com.google.android.widevine.lazy" \
  vendor/widevine/libwvdrmengine/apex/device/build.sh
Change-Id: I6b47d9de3d572298e84b26b744710818e9f75210
2023-05-11 16:01:39 +09:00
Alex Dale
ed81ae2b11 Remove duplicate session ID in metrics dump.
[ Merge of http://go/wvgerrit/174932 ]

Bug: 281794097
Test: adb shell dumpsys android.hardware.drm.IDrmFactory/widevine -m
Change-Id: Id29e1c4298ed5b86453f22012cfccc2cb5ee7d05
2023-05-10 16:20:45 -07:00
Kyle Zhang
86b74e0e61 Merge changes Icd280b53,I6eed117e into udc-dev am: 1a42aed25b am: ec1bedb5ac am: e2592a3e20
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23049485

Change-Id: I397cc0546b7530332b488c265a28c5c2bde7bd7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 21:32:04 +00:00
Kyle Zhang
c9863fbc97 Merge changes Icd280b53,I6eed117e into udc-dev am: 1a42aed25b am: ec1bedb5ac am: 8c55ada2c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23049485

Change-Id: I35aee57028da94738160df5d689bf80eba8c6e4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 21:07:06 +00:00
Kyle Zhang
d9d9a3c82f Merge changes Icd280b53,I6eed117e into udc-dev am: 1a42aed25b am: 1b7a73cbc9 am: 2db7003601
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23049485

Change-Id: I7b7fb30c327a645a90c67cc0305d9db3bffc5fbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 20:40:44 +00:00
Kyle Zhang
8c55ada2c0 Merge changes Icd280b53,I6eed117e into udc-dev am: 1a42aed25b am: ec1bedb5ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23049485

Change-Id: I4378a595f5fec4730ed42949be9ecd5964c124fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 20:23:24 +00:00
Kyle Zhang
e2592a3e20 Merge changes Icd280b53,I6eed117e into udc-dev am: 1a42aed25b am: ec1bedb5ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23049485

Change-Id: I0a44e459ec4e288913f3a33d951b9c3612561b98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 20:18:40 +00:00
Kyle Zhang
2db7003601 Merge changes Icd280b53,I6eed117e into udc-dev am: 1a42aed25b am: 1b7a73cbc9
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23049485

Change-Id: Ied02aef7b5210cdb4ef40874eb874e07acd91368
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 20:01:41 +00:00
Kyle Zhang
ec1bedb5ac Merge changes Icd280b53,I6eed117e into udc-dev am: 1a42aed25b
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23049485

Change-Id: Iab9ef74a334cad8d5e77853b62b11ca7abd3abbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 19:38:37 +00:00
Kyle Zhang
1b7a73cbc9 Merge changes Icd280b53,I6eed117e into udc-dev am: 1a42aed25b
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23049485

Change-Id: Ie70dd6b6cb6459571a8678e301d51b402787bd6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 19:13:26 +00:00
Kyle Zhang
1a42aed25b Merge changes Icd280b53,I6eed117e into udc-dev
* changes:
  Cast Receiver integration test
  Combine provisioning code for tests and improve logging
2023-05-10 18:40:30 +00:00
Fred Gylys-Colwell
d211195f92 Cast Receiver integration test
Merge from Widevine repo of http://go/wvgerrit/169471

Remove the test in android tests and add it to the
core tests.

Bug: 276464340
Test: GTEST_FILTER="CorePIGTest.CastReceiverProvisioning*" jenkins/run_fake_l1_tests
Change-Id: Icd280b532ddae274f66b2fab3e65520e96adb7cb
2023-05-10 18:40:21 +00:00
Fred Gylys-Colwell
836b1a30a6 Combine provisioning code for tests and improve logging
Merge from Widevine repo of http://go/wvgerrit/169018

This CL adds a provisioning holder that attempts to
provision and logs the request and response for
failures. The server team can replay the request to debug
problems on their end.

Bug: 276464340
Test: ran cast and ota tests
Change-Id: I6eed117e504ae3287f2ba16c3c507cfdc7456f8d
2023-05-10 18:38:50 +00:00
Rahul Frias
5efd913d48 Fix oec session id in dynamic adpater am: 09d7572ece am: d596e934af am: 2aa838ef07
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23104917

Change-Id: Ie550b05fc0468c467bebfc0c1b3adfb38501ef10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 09:00:46 +00:00
Rahul Frias
278b24d375 Fix oec session id in dynamic adpater am: 09d7572ece am: 7b9a15c592 am: cf5f3ea3ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23104917

Change-Id: I8d3b3eb6221e1261eb05aa5f9e45b4a39464fc49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 08:56:41 +00:00
Rahul Frias
615bbcbbd4 Fix oec session id in dynamic adpater am: 09d7572ece am: d596e934af am: a39c13f8cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23104917

Change-Id: Idb5da7e84f2d43034b217d248a9c470db48decf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 08:55:30 +00:00
Rahul Frias
cf5f3ea3ba Fix oec session id in dynamic adpater am: 09d7572ece am: 7b9a15c592
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23104917

Change-Id: I15d95408496c122813bcefcfce162970339a06c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 07:57:53 +00:00
Rahul Frias
2aa838ef07 Fix oec session id in dynamic adpater am: 09d7572ece am: d596e934af
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23104917

Change-Id: Ia269e502ef01fa5f09de198a417fa078b7951ad7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 07:56:51 +00:00
Rahul Frias
a39c13f8cf Fix oec session id in dynamic adpater am: 09d7572ece am: d596e934af
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23104917

Change-Id: Ibeaebb9ac1deda051cfb68393dab255581baf7e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 07:52:37 +00:00
Rahul Frias
d596e934af Fix oec session id in dynamic adpater am: 09d7572ece
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23104917

Change-Id: I6666ff4867e93535ead2dad7f912ee99f2cc7b5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 07:14:39 +00:00
Rahul Frias
7b9a15c592 Fix oec session id in dynamic adpater am: 09d7572ece
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23104917

Change-Id: I2fb40404e53aa4cee492ed0c435e3b42136aef1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 07:10:40 +00:00
Rahul Frias
09d7572ece Fix oec session id in dynamic adpater
[ Merge of http://go/wvgerrit/174572 ]

Pass the real oemcrypto session id from `pair.session` instead of
`session` for CopyBuffer, 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
Test: wvts
Change-Id: Ic5e21ccb227d4c4992ef500435fa3b68812c4d9b
2023-05-08 23:21:47 -07:00