Commit Graph

7731 Commits

Author SHA1 Message Date
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
eb72b1dfe4 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: Ibeecc5f906959378a1a8d591705e24cd20cbd7d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-13 05:22:17 +00:00
Treehugger Robot
5f5089dd13 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: I1cacb99491c0f05be9a6293f28fdc85afb4a4ad2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-13 05:22:11 +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
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
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
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
baa6824d9a Merge changes I5cbfcc73,I3070b3f3 into udc-dev am: 75c1b88603
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23094536

Change-Id: Id36014a8f7cc2b09ed1ffb95258491e03e3b87c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-13 04:40:41 +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
Treehugger Robot
90269c3633 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: I9048e8eb091b9173d0cde5c79510a7282fa23ab7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-13 04:40:22 +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
45396e1db4 Fix build_test breakage am: 5a6c57b11a am: ba6b21281b am: ab4c1e6f63 am: e2addd3455
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23213877

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

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

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

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

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

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

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

Change-Id: Ifd513609571c21555577932b2e2128caa581d261
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-13 00:46:24 +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
b97e729502 Merge changes Ied664ce8,I90004025 into udc-dev am: 13368f4076 am: 023fd9d026 am: 3feba213eb am: 931781d34c
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23088670

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

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

Change-Id: I68ffdfdd1fd35c80321d4592a4a78dd6b5ccaf2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 17:17:33 +00:00
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
cba5f6df51 Merge changes Ied664ce8,I90004025 into udc-dev am: 13368f4076 am: ff69157968
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23088670

Change-Id: I685780940b18d74a03f76e82009201b8613da7cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 16:09:37 +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
ff69157968 Merge changes Ied664ce8,I90004025 into udc-dev am: 13368f4076
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23088670

Change-Id: I181b8f4c8c9b9fb4baa3e1bc52b4e6d8cce24f04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 15:32:13 +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
379bd33174 Merge "Add build script for widevine apkset." into udc-dev am: d13f8124ff am: fbaede0920 am: 9f2adca71c am: 93b8d987ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23157000

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

Change-Id: Ic2389c276b42d08e0a573fecbd11e94ad50b76c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 10:18: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
a01442b888 Merge "Add build script for widevine apkset." into udc-dev am: d13f8124ff am: f12b0f6be5 am: 386824c5dd am: 4bae5c24b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23157000

Change-Id: I4cb90a07e1645aa83efd4bce2acf5d67d587e2aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 10:17:01 +00:00