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

7216 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vicky Min
9add9d9e71 Fix oec session id in dynamic adpater am: 74a9f80790 am: 2b62113f19 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23246132

Change-Id: I601383aebedd65fcfcb7fcd6e9b55a1a60e9bac8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-16 03:49:24 +00:00
Vicky Min
534c03eea2 Fix oec session id in dynamic adpater am: 74a9f80790 am: d82d878d4c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23246132

Change-Id: I0344315efa3537995cd7ec7dbf9d9536bad5f5bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-16 03:32:49 +00:00
Vicky Min
2b62113f19 Fix oec session id in dynamic adpater am: 74a9f80790 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23246132

Change-Id: I31ff36896dd05e4500fc1f3c4b95645cf7c682fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-16 03:11:39 +00:00
Vicky Min
d82d878d4c Fix oec session id in dynamic adpater am: 74a9f80790 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23246132

Change-Id: I3c1b3d7f991465b98e15b53813f588d228251fde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-16 03:07:22 +00:00
Vicky Min
74a9f80790 Fix oec session id in dynamic adpater 
[ Merge of http://go/wvgerrit/175310 ]

Pass the real oemcrypto session id from `pair.session` instead of
`session` for LoadEntitledContentKeys, since `session` can be
changed when L1 and L3 are running in parallel and `session` in
that case may not be the correct oemcrypto session id any more.

Bug: 279967915, 282180589
Test: wvts
Change-Id: I127ff37abf8b618dfbcb623f59bc999e58e7a028
 2023-05-15 18:40:21 +00:00
Treehugger Robot
bac69055e1 Merge "Update gts/cts helper script with WVTS paths" into udc-dev am: 99b760c857 am: 0536d41235 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22961195

Change-Id: I20a127b8b6fb223d30022607fbebd1ad21d2f2f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-13 09:49:20 +00:00
Treehugger Robot
793ec7823d Merge "Update gts/cts helper script with WVTS paths" into udc-dev am: 99b760c857 am: c48df4a8db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22961195

Change-Id: I11ae3e718b6c25ebdd6f300717bc2135fb3ce258
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-13 09:33:37 +00:00
Treehugger Robot
0536d41235 Merge "Update gts/cts helper script with WVTS paths" into udc-dev am: 99b760c857 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22961195

Change-Id: Ic1bcc8fae79ebbdaca086198f6253bb6330412d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-13 09:12:53 +00:00
Treehugger Robot
c48df4a8db Merge "Update gts/cts helper script with WVTS paths" into udc-dev am: 99b760c857 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22961195

Change-Id: I6903d4b21a9bc2dfa7e96ab9f9b4e97ccb902829
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-13 09:08:45 +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
db72a16017 Merge changes I5cbfcc73,I3070b3f3 into udc-dev am: 75c1b88603 am: 3065ca84a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23094536

Change-Id: I2d41b2e609ea16e8f15acf2cd952594e60667140
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-13 05:23:21 +00:00
Treehugger Robot
61865b00d8 Merge "Fix oec session id in dynamic adpater" into udc-dev am: 81cb2ba955 am: 117fd709c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23218888

Change-Id: Ib8b77accb099778050ed0c13a5159631f916fc56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-13 05:22:37 +00:00
Rahul Frias
a7bf01ce2c Merge changes I5cbfcc73,I3070b3f3 into udc-dev am: 75c1b88603 am: 486c57f783 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23094536

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

Change-Id: I785cef7dcae10a38fdd94e334df3cfbcf802613c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-13 05:18:00 +00:00
Rahul Frias
486c57f783 Merge changes I5cbfcc73,I3070b3f3 into udc-dev am: 75c1b88603 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23094536

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

Change-Id: I035e02d71881ff16b53acb31576e2838814dc29e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-13 04:40:24 +00:00
Rahul Frias
3065ca84a8 Merge changes I5cbfcc73,I3070b3f3 into udc-dev am: 75c1b88603 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23094536

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

Change-Id: Ie43c8eaa8c39c1042bd604669ce59ec932e66242
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-13 04:36:35 +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
bfc2314723 Fix build_test breakage am: 5a6c57b11a am: ee9e07cace 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23213877

Change-Id: I902e8ce8c7f89b64b7767daa8d6515dd02068295
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-13 01:31:34 +00:00
Jooyung Han
7145b84919 Fix build_test breakage am: 5a6c57b11a am: ba6b21281b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23213877

Change-Id: Ib75577f5b7438e5159e0fa697b3d150de5a5abe6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-13 01:26:46 +00:00
Jooyung Han
ba6b21281b Fix build_test breakage am: 5a6c57b11a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23213877

Change-Id: I00ef62534753e692bec3ad465cf2f819d84c5aa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-13 00:46:36 +00:00
Jooyung Han
ee9e07cace Fix build_test breakage am: 5a6c57b11a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23213877

Change-Id: Ibfb75a1dd82cc8344e78735614d2b5b5b1bd5ea2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-13 00:42:51 +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
Vicky Min
5026c50ebc Fix oec session id in dynamic adpater 
[ Merge of http://go/wvgerrit/175058 ]

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: Iad0ac5e505d3b38d220f1484d4cf5f8bc3b5337f
 2023-05-12 21:17:58 +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
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
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
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