widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,003 Commits 2 Branches 0 Tags
7055fbb02acbdefdbef135f04f424eed3669bb46
Commit Graph

5003 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Dale
ca335b2c11 Only one function for reporting usage support. 
[ Merge of http://go/wvgerrit/121567 ]

Replaced the two usage support functions GetUsageSupportType() and
UsageInformationSupport() into a single function HasUsageInfoSupport().

Since moving to only supporting a single usage info system (usage table
header + usage entries), the different usage support functions have
lost their purpose.

One version of the method works on an open session and will use a
cached value of the property if previously set.  The other can be
called without opening the session (as used for query calls).

This is part of larger fix for the usage table initialization process.

Bug: 169195093
Test: CE CDM unit tests
Change-Id: I637c24dd143e995dbb0f8848850e3c71ff1018eb
 2021-04-09 01:34:57 -07:00
Alex Dale
ccda4faf7b Cleaned up OEMCrypto security level getter. 
[ Merge of http://go/wvgerrit/121566 ]

This clean up is part of a larger usage table initialization fix.

Bug: 169195093
Change-Id: I3ee818d1e5621f1f2fa64b189da4e66503d5e680
 2021-04-09 01:34:56 -07:00
Rahul Frias
fd44fdd246 Merge "Reword "blacklisted" to "forbidden"" into sc-dev am: 574dc28df5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14128160

Change-Id: I1dd18aa0fc5d58dd844a9b5174b569aaac52c33b
 2021-04-09 08:32:20 +00:00
Rahul Frias
574dc28df5 Merge "Reword "blacklisted" to "forbidden"" into sc-dev 2021-04-09 07:38:26 +00:00
Rahul Frias
78f4d48395 Merge "Correction to addition of LOCAL_LICENSE_KINDS to vendor/widevine" into sc-dev am: 6af4d181d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14117911

Change-Id: I742aa709cae7975c23b1a545280ed433b332045e
 2021-04-09 03:00:01 +00:00
Rahul Frias
6af4d181d1 Merge "Correction to addition of LOCAL_LICENSE_KINDS to vendor/widevine" into sc-dev 2021-04-09 02:14:01 +00:00
Robert Shih
0480d8d810 Merge "libvtswidevine: replace appspot with uat" into sc-dev am: 1f8f0f1ccc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14099570

Change-Id: Ied6516b09142e1d4b5a1982e21b848dce8289847
 2021-04-08 22:11:16 +00:00
Robert Shih
1f8f0f1ccc Merge "libvtswidevine: replace appspot with uat" into sc-dev 2021-04-08 21:36:07 +00:00
Rahul Frias
a40af9d1ef Reword "blacklisted" to "forbidden" 
[ Merge of http://go/wvgerrit/113563 ]

Bug: 159847851
Test: WV unit/integration tests
Change-Id: I138b3e3291cb9e75841d092ca1bfa9a652ad9f9a
 2021-04-08 11:54:06 -07:00
Rahul Frias
7c8d3e287e Correction to addition of LOCAL_LICENSE_KINDS to vendor/widevine 
Remove incorrectly identified license files in http://go/ag/13998816

Bug: 68860345
Bug: 151177513
Bug: 151953481
Test: mm
Change-Id: I676a63598c8a7df11a1cef6d8bebcc9940c961dc
 2021-04-08 07:56:48 +00:00
Edwin Wong
8c3e997471 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into qt-dev am: aabd91204a am: 389837df8c -s ours am: e2f3b13c78 am: 28d30a0af9 am: c3c05be7b6 -s ours am: c287730627 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499846

Change-Id: Ibf5b1fd83d185ba963633098bb774c6675da1e55
 2021-04-07 02:00:46 +00:00
Edwin Wong
937499d33a [automerger skipped] [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 9c278174c8 am: 605ae2e217 -s ours am: a423695ea0 am: 94cf4a7137 am: 6216c6e024 -s ours am: 4786786b6b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499846

Change-Id: Idd217dd6d1efc0ef835826c3e187a2fe4c80de36
 2021-04-07 02:00:45 +00:00
Edwin Wong
c287730627 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into qt-dev am: aabd91204a am: 389837df8c -s ours am: e2f3b13c78 am: 28d30a0af9 am: c3c05be7b6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia65ed5196c9da55432844476a86caa6a1702fe78
 2021-04-07 01:19:25 +00:00
Edwin Wong
4786786b6b [automerger skipped] [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 9c278174c8 am: 605ae2e217 -s ours am: a423695ea0 am: 94cf4a7137 am: 6216c6e024 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6ccf8ac5b3b596669b003c2034bd75342765f5d2
 2021-04-07 01:19:23 +00:00
Edwin Wong
f1b8c39c32 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into qt-dev am: aabd91204a am: 389837df8c -s ours am: e2f3b13c78 am: f21b00847b -s ours am: 6f1b7fab1e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499846

Change-Id: I4e60c34ea713f1de1cb64479d2440f6a4e77bdb9
 2021-04-07 00:58:57 +00:00
Edwin Wong
cd839e5076 [automerger skipped] [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 9c278174c8 am: 605ae2e217 -s ours am: a423695ea0 am: c82acab577 -s ours am: 4a55a10d16 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499846

Change-Id: I9d2719e9e92c5b37859c927e55323254060491fe
 2021-04-07 00:58:57 +00:00
Edwin Wong
6f1b7fab1e [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into qt-dev am: aabd91204a am: 389837df8c -s ours am: e2f3b13c78 am: f21b00847b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I011a4171cce3e92bd0d0f38438c894c44a348abd
 2021-04-07 00:36:49 +00:00
Edwin Wong
4a55a10d16 [automerger skipped] [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 9c278174c8 am: 605ae2e217 -s ours am: a423695ea0 am: c82acab577 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibdf9f8c5c666c19075350805ea1fa44472e0c5eb
 2021-04-07 00:36:48 +00:00
Edwin Wong
c3c05be7b6 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into qt-dev am: aabd91204a am: 389837df8c -s ours am: e2f3b13c78 am: 28d30a0af9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499846

Change-Id: I0cb9769784651c4a1b8c6267ccfea3b591a5eef1
 2021-04-07 00:32:24 +00:00
Edwin Wong
6216c6e024 [automerger skipped] [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 9c278174c8 am: 605ae2e217 -s ours am: a423695ea0 am: 94cf4a7137 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499846

Change-Id: Ia241a9673a9cf281763f268fe8ea9b5f1a4f2a9c
 2021-04-07 00:32:23 +00:00
Edwin Wong
f21b00847b [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into qt-dev am: aabd91204a am: 389837df8c -s ours am: e2f3b13c78 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499846

Change-Id: Ic51d0acefb24d6265cb42adc5b7447e43c6bc681
 2021-04-06 23:52:20 +00:00
Edwin Wong
c82acab577 [automerger skipped] [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 9c278174c8 am: 605ae2e217 -s ours am: a423695ea0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499846

Change-Id: I9ffa3d2b096e62f92848ea103be82ecad48e6c08
 2021-04-06 23:52:20 +00:00
Edwin Wong
28d30a0af9 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into qt-dev am: aabd91204a am: 389837df8c -s ours am: e2f3b13c78 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499846

Change-Id: I893384792c4cf7677fff871433cf6228df7f0e7a
 2021-04-06 23:47:33 +00:00
Edwin Wong
94cf4a7137 [automerger skipped] [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 9c278174c8 am: 605ae2e217 -s ours am: a423695ea0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499846

Change-Id: I14c7cdded7ca2e41298594ac7df706ecb75989f1
 2021-04-06 23:47:32 +00:00
Edwin Wong
e2f3b13c78 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into qt-dev am: aabd91204a am: 389837df8c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I57e1cda75c201ab7c722d077be6aa94b22ebb617
 2021-04-06 23:27:20 +00:00
Edwin Wong
a423695ea0 [automerger skipped] [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 9c278174c8 am: 605ae2e217 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id2b6c02ef85c826ce7b74b0a95797082b0845f5a
 2021-04-06 23:27:19 +00:00
Edwin Wong
8c4759e3ca [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into rvc-dev am: a6cc3b79d2 am: 7b380179e8 am: 5a3544e7d2 -s ours am: fb4b95ecc3 -s ours 
am skip reason: skip tag Change-Id If62b73a9c636048f942a2fc63a13b5bfd1e57b86 with SHA-1 596d8bf4cc is already in history

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

Change-Id: Ifdcba61fcd60714485bfba74bf85474231f11b1b
 2021-04-06 23:06:44 +00:00
Edwin Wong
28ecc3754c [automerger skipped] [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 76f39ddb08 am: 2c59c30f1b am: 79b4677c6e -s ours am: 0ad236bd04 -s ours 
am skip reason: skip tag Change-Id If62b73a9c636048f942a2fc63a13b5bfd1e57b86 with SHA-1 596d8bf4cc is already in history

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

Change-Id: I059df645166119452ca79676a60802862c29437e
 2021-04-06 23:06:43 +00:00
Edwin Wong
389837df8c Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into qt-dev am: aabd91204a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499846

Change-Id: I842a3b15c82a20085825bfda63ee023feed4a653
 2021-04-06 23:06:29 +00:00
Edwin Wong
605ae2e217 [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 9c278174c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499846

Change-Id: I1cb45d35088d149f02b0bb6c408e5fee3d79c1db
 2021-04-06 23:06:28 +00:00
Edwin Wong
fb4b95ecc3 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into rvc-dev am: a6cc3b79d2 am: 7b380179e8 am: 5a3544e7d2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibb0484bb0f7cf71b24ceb2adf74bd363e1fce376
 2021-04-06 22:49:37 +00:00
Edwin Wong
0ad236bd04 [automerger skipped] [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 76f39ddb08 am: 2c59c30f1b am: 79b4677c6e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id3a5850cbb3b2e40d3034933f1a88b047839563d
 2021-04-06 22:49:36 +00:00
Edwin Wong
95eadfe524 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into rvc-dev am: a6cc3b79d2 am: 565bf1412a -s ours am: dfb89bddcd -s ours 
am skip reason: skip tag Change-Id If62b73a9c636048f942a2fc63a13b5bfd1e57b86 with SHA-1 596d8bf4cc is already in history

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

Change-Id: Ib3b1270eb8f1749abddb1a83c5cb4f660c93c284
 2021-04-06 22:47:17 +00:00
Edwin Wong
7c133308b8 [automerger skipped] [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 76f39ddb08 am: a74c0ec1f0 -s ours am: 73eb4c2e8c -s ours 
am skip reason: skip tag Change-Id If62b73a9c636048f942a2fc63a13b5bfd1e57b86 with SHA-1 596d8bf4cc is already in history

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

Change-Id: Id3290d873502cf1c12f8af91e874aa2f347cf7cd
 2021-04-06 22:47:16 +00:00
Edwin Wong
aabd91204a Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into qt-dev 2021-04-06 22:27:14 +00:00
Edwin Wong
dfb89bddcd [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into rvc-dev am: a6cc3b79d2 am: 565bf1412a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id3190acf1d2fe9063aa963e8ad5a25f196281168
 2021-04-06 22:27:01 +00:00
Edwin Wong
73eb4c2e8c [automerger skipped] [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 76f39ddb08 am: a74c0ec1f0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibd7e76d76dc65b836eeeeec4b9c13d483bc7f251
 2021-04-06 22:27:00 +00:00
Edwin Wong
5a3544e7d2 Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into rvc-dev am: a6cc3b79d2 am: 7b380179e8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499847

Change-Id: Ia58ef580baab3ef4a5a2f07e9c51f13fce7ffc4c
 2021-04-06 22:23:04 +00:00
Edwin Wong
79b4677c6e [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 76f39ddb08 am: 2c59c30f1b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499847

Change-Id: I9d84f4bc553f9c665d418734a9cf032bb4460a0c
 2021-04-06 22:23:03 +00:00
Edwin Wong
565bf1412a Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into rvc-dev am: a6cc3b79d2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499847

Change-Id: I8395e9fe48ec01c35b2e0ad60a29d101f34af3ee
 2021-04-06 21:53:49 +00:00
Edwin Wong
a74c0ec1f0 [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 76f39ddb08 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499847

Change-Id: Ic310a2a04e47aea548ab74a6449c3f5835ee8049
 2021-04-06 21:53:48 +00:00
Edwin Wong
7b380179e8 Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into rvc-dev am: a6cc3b79d2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499847

Change-Id: Ifccf528b9a903082878f1492f03e3e232c797b96
 2021-04-06 21:49:15 +00:00
Edwin Wong
2c59c30f1b [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 76f39ddb08 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499847

Change-Id: Id08136edb62c110de282e66106ca096b19a757bb
 2021-04-06 21:49:14 +00:00
Edwin Wong
a6cc3b79d2 Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into rvc-dev 2021-04-06 21:06:40 +00:00
Edwin Wong
08faef8926 [automerger skipped] Merge "Fix potential decrypt destPtr overflow." into rvc-dev am: 92865466af -s ours am: eceedee2ea -s ours am: 34effc90d6 -s ours am: ea863fecd5 -s ours 
am skip reason: skip tag Change-Id Id3aece61d46d548c304782d4e1dc3a4747795c01 with SHA-1 0b18148b09 is already in history

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

Change-Id: I29318d3d09f3a0acfe9dda7938c9f60c67e4f7ee
 2021-04-06 17:37:18 +00:00
Edwin Wong
ea863fecd5 [automerger skipped] Merge "Fix potential decrypt destPtr overflow." into rvc-dev am: 92865466af -s ours am: eceedee2ea -s ours am: 34effc90d6 -s ours 
am skip reason: skip tag Change-Id Id3aece61d46d548c304782d4e1dc3a4747795c01 with SHA-1 0b18148b09 is already in history

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

Change-Id: I6595ec63f860070bba704943b274797d8b103a18
 2021-04-06 16:54:36 +00:00
Robert Shih
6a133bedcf libvtswidevine: replace appspot with uat 
Bug: 179093540
Test: VtsHalDrmV1_2TargetTest
Change-Id: I1f343fb977f85ca4b7bf5fbc28fbfac23fbc3f05
 2021-04-05 23:35:20 -07:00
Edwin Wong
1afecc2230 [automerger skipped] Merge "Fix potential decrypt destPtr overflow." into rvc-dev am: 92865466af -s ours am: 6e7f17dc74 -s ours am: f1a9139879 -s ours 
am skip reason: skip tag Change-Id Id3aece61d46d548c304782d4e1dc3a4747795c01 with SHA-1 f3ad627bcb is already in history

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

Change-Id: I47b63229c0f756a8218b1c1aef766e48bc328906
 2021-04-06 05:44:58 +00:00
Edwin Wong
f1a9139879 [automerger skipped] Merge "Fix potential decrypt destPtr overflow." into rvc-dev am: 92865466af -s ours am: 6e7f17dc74 -s ours 
am skip reason: skip tag Change-Id Id3aece61d46d548c304782d4e1dc3a4747795c01 with SHA-1 f3ad627bcb is already in history

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

Change-Id: I9a67c8eda7ef98e45ead4aa59a82a14de3804178
 2021-04-06 05:07:07 +00:00
Edwin Wong
34effc90d6 [automerger skipped] Merge "Fix potential decrypt destPtr overflow." into rvc-dev am: 92865466af -s ours am: eceedee2ea -s ours 
am skip reason: skip tag Change-Id Id3aece61d46d548c304782d4e1dc3a4747795c01 with SHA-1 f3ad627bcb is already in history

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

Change-Id: I3ced57ad41a646610a4a1778d574ebb37935f338
 2021-04-05 22:37:14 +00:00