Commit Graph

5675 Commits

Author SHA1 Message Date
Rahul Frias
67639f2a42 Merge "Correct an error reported when a license is restored and then released" into sc-dev am: d30c5043d1 am: 38209bedb6
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15150547

Change-Id: I280ee9296643f7f328fb99b4cb5dd42b6189a8fb
2021-07-01 19:36:29 +00:00
Rahul Frias
38209bedb6 Merge "Correct an error reported when a license is restored and then released" into sc-dev am: d30c5043d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15150547

Change-Id: Ie5e04820cabb094efe752b8185145ca74bcafccc
2021-07-01 19:29:13 +00:00
Rahul Frias
d30c5043d1 Merge "Correct an error reported when a license is restored and then released" into sc-dev 2021-07-01 19:17:21 +00:00
Alex Dale
e76c1cd239 Merge "PST and non PST can handle unlimited license durations." into sc-dev am: 1229aedcea am: 5500df9681
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15159035

Change-Id: I6afda98c3cb8261f6efd6bf4b97839211f9ae8e5
2021-07-01 07:54:44 +00:00
Alex Dale
5500df9681 Merge "PST and non PST can handle unlimited license durations." into sc-dev am: 1229aedcea
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15159035

Change-Id: If69362ccf3179cf4f287175dd061fe8eb2b26f2a
2021-07-01 07:41:28 +00:00
Alex Dale
aebb29986f Merge "PST and non PST can handle unlimited license durations." into sc-dev am: 1229aedcea am: f56fdbef3f am: c4946e61c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15159035

Change-Id: I3256b058450ec73eac41c89947228b9efb188c79
2021-07-01 07:21:23 +00:00
Alex Dale
bd36f43d35 Merge "PST and non PST can handle unlimited license durations." into sc-dev am: 1229aedcea am: 4ed10d691f am: ca0ce02872
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15159035

Change-Id: Iccbdf48ea02e7342675560f1a19f49ff228f41a5
2021-07-01 07:21:12 +00:00
Alex Dale
c4946e61c4 Merge "PST and non PST can handle unlimited license durations." into sc-dev am: 1229aedcea am: f56fdbef3f
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15159035

Change-Id: I2dd797a0364519fb1b7e700a8e3c099f808cc04c
2021-07-01 07:09:50 +00:00
Alex Dale
ca0ce02872 Merge "PST and non PST can handle unlimited license durations." into sc-dev am: 1229aedcea am: 4ed10d691f
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15159035

Change-Id: Icd40761b28213d02f849dbcb7cf46e73eebe3f3b
2021-07-01 07:09:28 +00:00
Alex Dale
4ed10d691f Merge "PST and non PST can handle unlimited license durations." into sc-dev am: 1229aedcea
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15159035

Change-Id: I4c6493fd8a2abfdddcaa6b6b694122b814c27118
2021-07-01 06:57:30 +00:00
Alex Dale
f56fdbef3f Merge "PST and non PST can handle unlimited license durations." into sc-dev am: 1229aedcea
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15159035

Change-Id: I37155d9ab27ed16bb21a873f4827aa9684db4da2
2021-07-01 06:56:25 +00:00
Alex Dale
1229aedcea Merge "PST and non PST can handle unlimited license durations." into sc-dev 2021-07-01 06:45:07 +00:00
Alex Dale
df47a7732a Merge "Updated integration test to handle unlimited license durations." into sc-dev am: 16a0ab2309 am: da0d78bf0b am: abc0311f93
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15136759

Change-Id: I82eeeea0ff441ec23f270989d435614c77671cf9
2021-07-01 06:06:48 +00:00
Alex Dale
208389b23e Merge "Updated integration test to handle unlimited license durations." into sc-dev am: 16a0ab2309 am: d7f36baddc am: 6ef83672ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15136759

Change-Id: I6dab034c4b618b4cd6ab8d88bbb9c8b70d73df66
2021-07-01 06:06:37 +00:00
Alex Dale
abc0311f93 Merge "Updated integration test to handle unlimited license durations." into sc-dev am: 16a0ab2309 am: da0d78bf0b
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15136759

Change-Id: I32aadbe3815e84f87933447c0baf832d3bc5b6e7
2021-07-01 06:03:02 +00:00
Alex Dale
5a3a50262f Merge "Updated integration test to handle unlimited license durations." into sc-dev am: 16a0ab2309 am: 5e2297dc7e
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15136759

Change-Id: Ic6e44caa6530313f50f15048f8cc2d50bcc07e81
2021-07-01 06:02:33 +00:00
Alex Dale
6ef83672ca Merge "Updated integration test to handle unlimited license durations." into sc-dev am: 16a0ab2309 am: d7f36baddc
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15136759

Change-Id: Ibe2b1d69ffbb53e46b1da09696a782af3edc9d77
2021-07-01 05:57:29 +00:00
Alex Dale
da0d78bf0b Merge "Updated integration test to handle unlimited license durations." into sc-dev am: 16a0ab2309
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15136759

Change-Id: I975afd30a91155770f9e21e48db5184ef63440f4
2021-07-01 05:51:31 +00:00
Alex Dale
5e2297dc7e Merge "Updated integration test to handle unlimited license durations." into sc-dev am: 16a0ab2309
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15136759

Change-Id: Ib3bc83382a539fee11d6ad8ec43bdf2c1170d078
2021-07-01 05:50:42 +00:00
Alex Dale
d7f36baddc Merge "Updated integration test to handle unlimited license durations." into sc-dev am: 16a0ab2309
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15136759

Change-Id: I59fb3001fe68c6d7a34844957552b552207a35ba
2021-07-01 05:49:52 +00:00
Alex Dale
16a0ab2309 Merge "Updated integration test to handle unlimited license durations." into sc-dev 2021-07-01 05:35:29 +00:00
Fred Gylys-Colwell
a566d8f1e0 Merge "Cache security level" into sc-dev am: 47324cc6fe am: 1c82e33cb8 am: 4b1059fd08
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15085899

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

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

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

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

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

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

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

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

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

Change-Id: I18d347785a709717e0dd16f0e7c2705fdad595a8
2021-07-01 04:51:16 +00:00
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