widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,159 Commits 2 Branches 0 Tags
3b44c810d6b9d82f1b9cc65cd0e5679fa589615c
Commit Graph

6159 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
1200c9bbc6 [automerger skipped] Merge "Sync oemcrypto reference code" into sc-dev am: 6d1898f20f am: a7ecf86940 -s ours am: a89aa95bf9 -s ours 
am skip reason: skipped by user fredgc

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15055360

Change-Id: Ia25ce5f026d3ea47c96f2e440bd80dbcea5fe9ae
 2021-07-01 04:51:08 +00:00
Fred Gylys-Colwell
1c82e33cb8 Merge "Cache security level" into sc-dev am: 47324cc6fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15085899

Change-Id: Ie95935d67d2959db0877f6425d83d0d23246e51a
 2021-07-01 04:42:50 +00:00
TreeHugger Robot
a1dd61ba6d Merge "Add extra RSA private keys to unit tests" into sc-dev am: 853ab51cb3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15136762

Change-Id: I6bf6290d1c8605536d47d502171fef3d790edd18
 2021-07-01 04:42:45 +00:00
TreeHugger Robot
6b10fae469 [automerger skipped] Merge "Sync oemcrypto reference code" into sc-dev am: 6d1898f20f -s ours 
am skip reason: skipped by user fredgc

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15055360

Change-Id: Ie88d33bb1b80487b2da1c237051cab65a9c4fc1a
 2021-07-01 04:42:39 +00:00
Fred Gylys-Colwell
e9a59a0f89 Merge "Cache security level" into sc-dev am: 47324cc6fe am: d21b72383c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15085899

Change-Id: I5a5d6f3ef32860b053635d4fcf95522b436aca88
 2021-07-01 04:42:35 +00:00
TreeHugger Robot
395e0fbb5a Merge "Add extra RSA private keys to unit tests" into sc-dev am: 853ab51cb3 am: 3ad20c7afc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15136762

Change-Id: I473c5d174b28fc5ac386a54c3fce190bfecfb674
 2021-07-01 04:42:31 +00:00
TreeHugger Robot
a89aa95bf9 [automerger skipped] Merge "Sync oemcrypto reference code" into sc-dev am: 6d1898f20f am: a7ecf86940 -s ours 
am skip reason: skipped by user fredgc

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15055360

Change-Id: I05ef5201cc0821c6f5c1103a89be4f63aa4d6747
 2021-07-01 04:42:27 +00:00
Fred Gylys-Colwell
2b66fc3475 Merge "Cache security level" into sc-dev am: 47324cc6fe am: 6d2598a291 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15085899

Change-Id: I1a562f26c3de4adf1216f8f1d7c0fc98df3d5bab
 2021-06-30 21:43:34 +00:00
TreeHugger Robot
62b27c1b9c Merge "Add extra RSA private keys to unit tests" into sc-dev am: 853ab51cb3 am: 85f91e021a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15136762

Change-Id: Icbd32dfdcb2178f2b0dc86ebb814c88a3c3239fe
 2021-06-30 21:43:31 +00:00
TreeHugger Robot
f4f9827c64 [automerger skipped] Merge "Sync oemcrypto reference code" into sc-dev am: 6d1898f20f am: 533f018aab -s ours 
am skip reason: Merged-In Ie787bcf9c66a7605700c3dc29a8aa16406926ce3 with SHA-1 42188c007a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15055360

Change-Id: I9fefce3e051c7fd04106154198d578a6dacfddec
 2021-06-30 21:43:26 +00:00
Fred Gylys-Colwell
d21b72383c Merge "Cache security level" into sc-dev am: 47324cc6fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15085899

Change-Id: Ia30d17723b94130121b0db32224543aa6a71fc91
 2021-06-30 21:36:55 +00:00
TreeHugger Robot
3ad20c7afc Merge "Add extra RSA private keys to unit tests" into sc-dev am: 853ab51cb3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15136762

Change-Id: I3980624b930b959881b0055b35bce6a7c6670110
 2021-06-30 21:36:52 +00:00
TreeHugger Robot
a7ecf86940 Merge "Sync oemcrypto reference code" into sc-dev am: 6d1898f20f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15055360

Change-Id: I661a1372fb71a78bb6b161c9b3054d273fadec54
 2021-06-30 21:36:16 +00:00
Fred Gylys-Colwell
6d2598a291 Merge "Cache security level" into sc-dev am: 47324cc6fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15085899

Change-Id: I514c3cfc08f177e4770e0a62fddfc5a52389ea82
 2021-06-30 21:36:13 +00:00
TreeHugger Robot
85f91e021a Merge "Add extra RSA private keys to unit tests" into sc-dev am: 853ab51cb3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15136762

Change-Id: Ib8ec338f4abec0c10823687ae9eacc8bd62f184b
 2021-06-30 21:36:10 +00:00
TreeHugger Robot
533f018aab Merge "Sync oemcrypto reference code" into sc-dev am: 6d1898f20f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15055360

Change-Id: Ie36ebd1145028597dfbbee5bd58b8e4582ce119f
 2021-06-30 21:36:00 +00:00
Fred Gylys-Colwell
47324cc6fe Merge "Cache security level" into sc-dev 2021-06-30 21:35:36 +00:00
TreeHugger Robot
853ab51cb3 Merge "Add extra RSA private keys to unit tests" into sc-dev 2021-06-30 21:32:01 +00:00
TreeHugger Robot
e487461ca3 Merge "Allow delayed error code in generic crypto" into sc-dev am: 99c4d463d9 am: f08ae7b4be am: a17223048f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15008617

Change-Id: Ia710bbc421f9c622d8ebe087a19f367a34d14d4a
 2021-06-30 21:30:03 +00:00
TreeHugger Robot
58752ca19d Merge "Allow delayed error code in generic crypto" into sc-dev am: 99c4d463d9 am: 0daff1c13d am: f850cd9b84 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15008617

Change-Id: I811f7fbe6c96d73f1e013f6b2974e2c7d52787c0
 2021-06-30 21:29:58 +00:00
TreeHugger Robot
a17223048f Merge "Allow delayed error code in generic crypto" into sc-dev am: 99c4d463d9 am: f08ae7b4be 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15008617

Change-Id: I492d4f8bf0b138daa716846a173dd53c4801ab26
 2021-06-30 21:26:44 +00:00
TreeHugger Robot
f850cd9b84 Merge "Allow delayed error code in generic crypto" into sc-dev am: 99c4d463d9 am: 0daff1c13d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15008617

Change-Id: I950208cfb53f345b3fbd9f102c435249f1cac759
 2021-06-30 21:24:54 +00:00
TreeHugger Robot
03b9ed4008 Merge "Update OEMCrypto buffer offset tests" into sc-dev am: 41d7b74558 am: 6c4b357836 am: 25e69c97fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15055162

Change-Id: I20279984bbb9b8bd812cf753828d422a7c78c256
 2021-06-30 21:24:41 +00:00
Automerger Merge Worker
046ef301df Merge "Merge "Update OEMCrypto buffer offset tests" into sc-dev am: 41d7b74558 am: 88c6500ba2 am: 3714a2c29a" 2021-06-30 21:24:30 +00:00
TreeHugger Robot
4edb15597d Merge "Update OEMCrypto buffer offset tests" into sc-dev am: 41d7b74558 am: 88c6500ba2 am: 3714a2c29a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15055162

Change-Id: Icbbf3c38343990d10c2d1a1e64b5c7084c607bde
 2021-06-30 21:24:27 +00:00
TreeHugger Robot
fd01107b54 Merge "Allow delayed error code in generic crypto" into sc-dev am: 99c4d463d9 am: 6e6bdad32a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15008617

Change-Id: Icdea1cd603a893c05e63088567cbabebeba9ee71
 2021-06-30 21:24:26 +00:00
TreeHugger Robot
6d1898f20f Merge "Sync oemcrypto reference code" into sc-dev 2021-06-30 21:20:58 +00:00
TreeHugger Robot
0daff1c13d Merge "Allow delayed error code in generic crypto" into sc-dev am: 99c4d463d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15008617

Change-Id: I57414ecc7b7e99f4ce2714a96d4b550798ce8071
 2021-06-30 21:15:47 +00:00
TreeHugger Robot
6e6bdad32a Merge "Allow delayed error code in generic crypto" into sc-dev am: 99c4d463d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15008617

Change-Id: Ib59abf06d1c387c9d869d5de31a4db68cc5ae3d6
 2021-06-30 21:14:58 +00:00
TreeHugger Robot
f08ae7b4be Merge "Allow delayed error code in generic crypto" into sc-dev am: 99c4d463d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15008617

Change-Id: Iec15443dd0894048448302c278dbe4afd531f50f
 2021-06-30 21:14:49 +00:00
TreeHugger Robot
25e69c97fb Merge "Update OEMCrypto buffer offset tests" into sc-dev am: 41d7b74558 am: 6c4b357836 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15055162

Change-Id: I0ceedbafbe98513d5f9996bcc176e98c91f5eca0
 2021-06-30 21:12:16 +00:00
TreeHugger Robot
3714a2c29a Merge "Update OEMCrypto buffer offset tests" into sc-dev am: 41d7b74558 am: 88c6500ba2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15055162

Change-Id: I00d5f291bf1bb17d8f85b1e9164322d6f8476c7e
 2021-06-30 21:11:45 +00:00
TreeHugger Robot
af0ac69fad Merge "Update OEMCrypto buffer offset tests" into sc-dev am: 41d7b74558 am: ae3815c1fa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15055162

Change-Id: I2baacf116ca77a092953532ee6997cb55a9890ed
 2021-06-30 21:11:21 +00:00
TreeHugger Robot
99c4d463d9 Merge "Allow delayed error code in generic crypto" into sc-dev 2021-06-30 21:06:17 +00:00
TreeHugger Robot
88c6500ba2 Merge "Update OEMCrypto buffer offset tests" into sc-dev am: 41d7b74558 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15055162

Change-Id: I7f3f64bec9748f6045cc33b67b9f8c7dbe0ded15
 2021-06-30 21:02:07 +00:00
TreeHugger Robot
ae3815c1fa Merge "Update OEMCrypto buffer offset tests" into sc-dev am: 41d7b74558 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15055162

Change-Id: Iab7ed5adf15a1613e9d8410c4a49dd35e321880f
 2021-06-30 21:00:51 +00:00
TreeHugger Robot
6c4b357836 Merge "Update OEMCrypto buffer offset tests" into sc-dev am: 41d7b74558 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15055162

Change-Id: I440325ba59bfaf1f3e10efcb9a96f1a894394b85
 2021-06-30 21:00:05 +00:00
TreeHugger Robot
41d7b74558 Merge "Update OEMCrypto buffer offset tests" into sc-dev 2021-06-30 20:49:57 +00:00
Rahul Frias
2327a7d861 Merge "Address unit test failures" into sc-dev am: 5271d95ce4 am: 8648cc7b4a am: 00adc49f32 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14940264

Change-Id: I8190e9a42b5b9da49c6354f5c42b863780832dfd
 2021-06-30 20:12:10 +00:00
Rahul Frias
1d9f0f3f38 Merge "Address unit test failures" into sc-dev am: 5271d95ce4 am: 725f3d9e18 am: c6f013efdc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14940264

Change-Id: I6847c21738aa7f11ffa4bafe1f05f8aa00301842
 2021-06-30 20:12:04 +00:00
Rahul Frias
00adc49f32 Merge "Address unit test failures" into sc-dev am: 5271d95ce4 am: 8648cc7b4a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14940264

Change-Id: I838f481e9c9a3d8db16320f38e5c6ebc396163a3
 2021-06-30 19:57:54 +00:00
Rahul Frias
c6f013efdc Merge "Address unit test failures" into sc-dev am: 5271d95ce4 am: 725f3d9e18 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14940264

Change-Id: Id1078dce988bd92d664acf7473e90cb30eace40d
 2021-06-30 19:57:42 +00:00
Rahul Frias
1c74895135 Merge "Address unit test failures" into sc-dev am: 5271d95ce4 am: 171096b9bb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14940264

Change-Id: I2dc400c613a289a51ddb546cd31a9b4aae4d589a
 2021-06-30 19:57:09 +00:00
Rahul Frias
725f3d9e18 Merge "Address unit test failures" into sc-dev am: 5271d95ce4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14940264

Change-Id: Ic5924bf04b90398d41863f95f7a2d43b732d60f2
 2021-06-30 19:42:13 +00:00
Rahul Frias
171096b9bb Merge "Address unit test failures" into sc-dev am: 5271d95ce4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14940264

Change-Id: I4c45f2eedaed5f8f2bdca5efad36392faf58028e
 2021-06-30 19:41:26 +00:00
Rahul Frias
8648cc7b4a Merge "Address unit test failures" into sc-dev am: 5271d95ce4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14940264

Change-Id: If13a949056c15529919f076c1e903fcdd15d0eb7
 2021-06-30 19:41:08 +00:00
Rahul Frias
5271d95ce4 Merge "Address unit test failures" into sc-dev 2021-06-30 19:30:22 +00:00
Fred Gylys-Colwell
2d9bdfea58 Update OEMCrypto buffer offset tests 
Merge from Widevine repo of http://go/wvgerrit/127524

Some unit tests used the response buffer size before the size had been
computed. This CL updates the tests.

Bug: 183440999
Bug: 184866351
Test: Ran unit tests on Prov 3.0 device.
Change-Id: I0b23dc7b0dafa9b9eab3cdbd7f29074898e4709b
 2021-06-30 17:46:18 +00:00
Alex Dale
14bd15a08c PST and non PST can handle unlimited license durations. 
[ Merge of http://go/wvgerrit/128183  ]

As was the case with WvCdmStreamingUsageReportTest.ReportTest, the
following tests were also updated to handle the case where "license
duration" is unlimited:
- WvCdmStreamingNoPstTest.UsageTest
- WvCdmStreamingPstTest.UsageTest
- WvCdmOfflineUsageReportTest.UsageTest

This is due to the new license duration model used for V16 licenses.

Bug: 163542905
Test: cdm_extended_duration_test
Change-Id: I24d3fc17fcf19129a19ed39a5c6c1ddd59ed073d
 2021-06-30 10:41:07 -07:00
Rahul Frias
c882bd8230 Correct an error reported when a license is restored and then released 
[ Merge of http://go/wvgerrit/128143 ]

Now reports LICENSE_STATE_ERROR rather than ERROR_DRM_GENERIC_PLUGIN
to make the cause of failure and suggested action more clear for app
developers. Also added an additional error log.

Bug: 190645000
Test: WV unit/integration tests
Change-Id: Ib23ca628c590316f90f497d8fdfbab24fd644d6f
 2021-06-29 20:21:06 -07:00