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

7600 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
1af120c6db Merge "Add build script for widevine apkset." into udc-dev am: d13f8124ff am: 4c18d98bc7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23157000

Change-Id: If9f983906bc12706449008318ca0895f4ef6aa2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 09:30:00 +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
4c18d98bc7 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: I35bea8685da5ae3bcc3950563706aa36966c2b64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 08:51:50 +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
Alex Dale
364c702662 Remove duplicate session ID in metrics dump. am: ed81ae2b11 am: 36da43c5f1 am: 47ce6117ef am: 03d890f76a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23149071

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

Change-Id: Ie7ee394ae85fb5a7dcf05a5846706f4e6f1c84f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 02:17:25 +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
2565521f08 Remove duplicate session ID in metrics dump. am: ed81ae2b11 am: 36da43c5f1 am: 16487b0b80 am: 324408227a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23149071

Change-Id: I81c6253792271b4bae76f173b5a5218897e458c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 22:59:52 +00: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
358846f286 Remove duplicate session ID in metrics dump. am: ed81ae2b11 am: 6204d8b5fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23149071

Change-Id: Ia77107eecbc3441a15f4ee2111479fc68a2f76f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:38:18 +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
6204d8b5fe Remove duplicate session ID in metrics dump. am: ed81ae2b11 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23149071

Change-Id: Ia2643a02a851a8143cade07b228cb9c61860202e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:03:08 +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
Kyle Zhang
a47be63ffd Merge changes Icd280b53,I6eed117e into udc-dev am: 1a42aed25b am: ec1bedb5ac am: e2592a3e20 am: 86b74e0e61 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23049485

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

Change-Id: I6a6c29db513fd6a62e1c96992f09522facfa22ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 09:37:15 +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
Kyle Zhang
959735b341 Merge changes Icd280b53,I6eed117e into udc-dev am: 1a42aed25b am: 1b7a73cbc9 am: 2db7003601 am: d9d9a3c82f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23049485

Change-Id: I6fe4ddebcb362c8c6a09949b69e5970cdf71a182
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 08:08:54 +00: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