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

6479 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
9378f74171 Merge "Correct when OEMCrypto_GetOEMPublicCertificate is called" into tm-dev am: 27d2826d03 am: 6905de19f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17365196

Change-Id: Ic9ef9f131d6ee1d7d6138294ed9a3c62e6ff0220
 2022-03-24 04:23:40 +00:00
Rahul Frias
7ce3d819d9 Merge "Sync license_protocol.proto" into tm-dev am: d3c653bd11 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17345666

Change-Id: I2832e85742b9f7ef967987f848a6152e37f72630
 2022-03-24 04:23:14 +00:00
TreeHugger Robot
6905de19f9 Merge "Correct when OEMCrypto_GetOEMPublicCertificate is called" into tm-dev am: 27d2826d03 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17365196

Change-Id: Ic055b39d9209f1cccee8d7fcd6ee52167986cbf2
 2022-03-24 04:17:15 +00:00
TreeHugger Robot
355e671d6e Merge "Update ExoPlayerDemo.apk" into tm-dev am: e1c107bd8f am: 202363e65d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17359730

Change-Id: Ia7d7af078ed2f9b0ae1bae23d38335c81cc0302b
 2022-03-24 04:16:51 +00:00
Alex Dale
c471a87446 Merge "Threading requirements of UsageTableHeader." into tm-dev am: cbea9a11ef am: ba0b041975 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17352456

Change-Id: If439e86241ef18ccf1cb402a951390a183b6170a
 2022-03-24 04:16:15 +00:00
TreeHugger Robot
202363e65d Merge "Update ExoPlayerDemo.apk" into tm-dev am: e1c107bd8f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17359730

Change-Id: If5b1756eb1ab3cd449c2e5f50cd4c6c0b395846a
 2022-03-24 04:16:09 +00:00
Alex Dale
ba0b041975 Merge "Threading requirements of UsageTableHeader." into tm-dev am: cbea9a11ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17352456

Change-Id: Idd4c28c9e89e003fea89cdd3620a0d038cf3b6e6
 2022-03-24 04:12:35 +00:00
Alex Dale
36d28ecb9e Merge changes from topic "presubmit-am-2da434748b5f487f8fc0a047848553c9" into tm-mainline-prod am: 5d139b2933 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17352456

Change-Id: I37671e166eb2e402b29eac39ebfa1d92794cda36
 2022-03-24 04:08:12 +00:00
TreeHugger Robot
0643104d83 Merge "Copied OEMCrypto utils to Android." into tm-dev am: 26ee600923 am: 1cc217351a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17312281

Change-Id: I9cf3b825b31e1404ffc899b00d45bd2f3082c24e
 2022-03-24 04:06:49 +00:00
Alex Dale
6d09561e82 Merge "Threading requirements of UsageTableHeader." into tm-dev am: cbea9a11ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17352456

Change-Id: I348c0534f30f83811dffb6d8ec72996f8c5cb7f8
 2022-03-24 04:06:10 +00:00
Rahul Frias
d3c653bd11 Merge "Sync license_protocol.proto" into tm-dev 2022-03-24 03:58:21 +00:00
TreeHugger Robot
27d2826d03 Merge "Correct when OEMCrypto_GetOEMPublicCertificate is called" into tm-dev 2022-03-24 03:52:42 +00:00
TreeHugger Robot
e1c107bd8f Merge "Update ExoPlayerDemo.apk" into tm-dev 2022-03-24 02:27:11 +00:00
Rahul Frias
c014da7da3 Correct when OEMCrypto_GetOEMPublicCertificate is called 
[ Merge of http://go/wvgerrit/148469 ]

OEMCrypto_GetOEMPublicCertificate needed to be called
before the OEM private key was loaded due to a bug in OEMCrypto.
The bug has been addressed and the call can now be removed.

OEMCrypto_GetOEMPublicCertificate is only applicable to
devices with OEM certs as their root of trust. Devices with
keyboxes (or BCC) as their RoT would return a spurious
error OEMCrypto_ERROR_NOT_IMPLEMENTED. Removing the call
addresses this as well.

Bug: 190231658
Test: WV unit/integration test
Change-Id: I8216ca5a78b8c2acb5681c7f599cdc41efdf9fc7
 2022-03-23 17:18:36 -07:00
Rahul Frias
3912635502 Sync license_protocol.proto 
[ Merge of http://go/wvgerrit/148470 ]

Bug: 226298543
Test: WV unit/integration tests
Change-Id: Id3300772182a089230e23a277775334f6731d45a
 2022-03-23 16:59:13 -07:00
Alex Dale
5d139b2933 Merge changes from topic "presubmit-am-2da434748b5f487f8fc0a047848553c9" into tm-mainline-prod 
* changes:
  [automerge] Threading requirements of UsageTableHeader. 2p: 64047c8958
  Threading requirements of UsageTableHeader.
 2022-03-23 23:56:53 +00:00
Alex Dale
cbea9a11ef Merge "Threading requirements of UsageTableHeader." into tm-dev 2022-03-23 23:56:53 +00:00
Alex Dale
5ba7ab4d25 Merge changes from topic "presubmit-am-2da434748b5f487f8fc0a047848553c9" 
* changes:
  [automerge] Threading requirements of UsageTableHeader. 2p: 64047c8958 2p: 6bff1691c5
  [automerge] Threading requirements of UsageTableHeader. 2p: 64047c8958
  Threading requirements of UsageTableHeader.
 2022-03-23 23:56:53 +00:00
TreeHugger Robot
1cc217351a Merge "Copied OEMCrypto utils to Android." into tm-dev am: 26ee600923 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17312281

Change-Id: Ie9861efbea099c18bd7ca0d7b2ce10cc8fcdd36f
 2022-03-23 23:33:08 +00:00
TreeHugger Robot
7cab9e5031 Merge "Copied OEMCrypto utils to Android." into tm-dev am: 26ee600923 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17312281

Change-Id: I5aca4c1df46e7fd61d2c22d1b46dd25684d40d57
 2022-03-23 23:32:51 +00:00
TreeHugger Robot
26ee600923 Merge "Copied OEMCrypto utils to Android." into tm-dev 2022-03-23 23:16:15 +00:00
Kyle Alexander
b705d68631 Update ExoPlayerDemo.apk 
Test: Playback of content in ExoPlayerDemo.apk

Bug: 203837661
Change-Id: Ic62b483b92215d2369b05bc2adc33d754ef5de5e
 2022-03-23 15:29:57 -07:00
Presubmit Automerger Backend
691a355fbe [automerge] Threading requirements of UsageTableHeader. 2p: 64047c8958 2p: 6bff1691c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17352456

Bug: 189366337
Change-Id: I7d3867d8b1cbfcd6d65cb113b9f7d513fdcb9498
 2022-03-23 18:54:33 +00:00
Presubmit Automerger Backend
6bff1691c5 [automerge] Threading requirements of UsageTableHeader. 2p: 64047c8958 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17352456

Bug: 189366337
Change-Id: I608978a6acd8b5166cb6f7101134a7319570c941
 2022-03-23 18:54:27 +00:00
Alex Dale
64047c8958 Threading requirements of UsageTableHeader. 
[ Merge of http://go/wvgerrit/148450 ]

This CL adds threading requirements to the method doc-comments of
UsageTableHeader.

Bug: 189366337
Test: usage_table_header_unittest
Change-Id: I671f702d3e8ec219cc8daaa220133cb8cec183c8
 2022-03-23 11:54:12 -07:00
Frederick Mayle
a415b078ea [automerge] libwvdrmengine: Fix double ownership of WVDrmFactory 2p: 3112fd5505 2p: e7ba29b5ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17353612

Bug: 226379467
Change-Id: Ib09f225b85dfeea9d3aed5af754a2b5840856843
 2022-03-23 18:00:14 +00:00
Frederick Mayle
e7ba29b5ae [automerge] libwvdrmengine: Fix double ownership of WVDrmFactory 2p: 3112fd5505 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17353612

Bug: 226379467
Change-Id: I107699d2e563a7fd32ad31584316bddaa43f5aa0
 2022-03-23 18:00:08 +00:00
Frederick Mayle
3112fd5505 libwvdrmengine: Fix double ownership of WVDrmFactory 
Using std::make_shared with ndk::SharedRefBase objects causes memory
errors.

Bug: 226379467
Test: TH
Change-Id: I3649ace96067e68cfc0ac998c836d9a8bd48bd11
 2022-03-23 18:00:00 +00:00
Edwin Wong
0f3c297250 Replace _hidl_ with _hal_ in test names 
[ Merged from http://go/wvgerrit/148451 ]

This step is a prelude in adding Widevine unit tests that
use AIDL interface.

Test: ./build_and_run_all_unit_tests.sh
Bug: 217247987
Change-Id: I449050819e6c9b0261066997dd45a6103b3a9a7a
 2022-03-23 07:16:27 -07:00
TreeHugger Robot
f3024f2a93 Merge "Enable Widevine Aidl service." into tm-dev am: dddd1142de am: 5867bbec85 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17158450

Change-Id: I19bdaf8d9024df29f456de9e1f70fad4eda594bc
 2022-03-22 23:57:57 +00:00
TreeHugger Robot
5867bbec85 Merge "Enable Widevine Aidl service." into tm-dev am: dddd1142de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17158450

Change-Id: I150e16d671e31a137056a5384411aba04533f2f0
 2022-03-22 23:33:34 +00:00
TreeHugger Robot
8b4efe6eb9 Merge "Enable Widevine Aidl service." into tm-dev am: dddd1142de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17158450

Change-Id: I60cba93678ff43c69c4d0c29908ae598a99f84c1
 2022-03-22 23:33:21 +00:00
Rahul Frias
c58cc6d5e4 Merge changes I10f0c1bc,I4abad9d6,Ic1d42756 into tm-dev am: d210233e58 am: 534dad1777 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17300766

Change-Id: I89efbb23cf0e37cc17ce55398cf77a827376f23f
 2022-03-22 23:27:29 +00:00
TreeHugger Robot
dddd1142de Merge "Enable Widevine Aidl service." into tm-dev 2022-03-22 23:17:15 +00:00
Rahul Frias
09db0f4f27 Merge changes I10f0c1bc,I4abad9d6,Ic1d42756 into tm-dev am: d210233e58 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17300766

Change-Id: Idef2f4b8dfb60bead7bdaa8f370b2ebf853e045c
 2022-03-22 23:06:57 +00:00
Rahul Frias
534dad1777 Merge changes I10f0c1bc,I4abad9d6,Ic1d42756 into tm-dev am: d210233e58 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17300766

Change-Id: Ia075ddd8cb66652aa97b3594144d4213b5407d67
 2022-03-22 23:06:08 +00:00
Rahul Frias
d210233e58 Merge changes I10f0c1bc,I4abad9d6,Ic1d42756 into tm-dev 
* changes:
  Return error first if the returned status is not ok
  Constrain the generated key type in testing
  Free EC key in test session destructor
 2022-03-22 21:51:32 +00:00
Edwin
253a804c57 Enable Widevine Aidl service. 
Merged from http://go/wvgerrit/146409

The original http://go/ag/16984707 was reverted due a
merge conflict from tm-dev to master, which
is now fixed by http://go/ag/17035190.

Bug: 219538389
Test: atest GtsMediaTestCases
Test: ./build_and_run_all_unit_tests
Change-Id: I95b639cf7ec138e809540db7a3fc0a234c7f4b2a
 2022-03-22 10:17:01 +00:00
Alex Dale
d9f2a671f9 Added key_session_ guard to SelectKey. am: 1fac6fa5de am: dba939b5ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17262613

Change-Id: I4b879204d531cb97164ea81063293c7fa6e704aa
 2022-03-22 05:46:59 +00:00
Alex Dale
6cfc1e06bf Added key_session_ guard to SelectKey. am: 1fac6fa5de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17262613

Change-Id: I70573778fb89a8f266cd0f756f133f597c6b9bed
 2022-03-22 05:32:35 +00:00
Alex Dale
dba939b5ee Added key_session_ guard to SelectKey. am: 1fac6fa5de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17262613

Change-Id: Ic5fbcc7fd3479edb6a78c522b0ff5a9b78663963
 2022-03-22 05:31:41 +00:00
Alex Dale
4a065adc33 Copied OEMCrypto utils to Android. 
The OEMCrypto utils have been copied over from the CDM repo.
Tests have been excluded for this CL.

Files represent a snapshot taken from http://go/wvgerrit/148270
and http://go/wvgerrit/148372.

Bug: 205902021
Change-Id: I1a58952cd1436a48974367c5436bf7296163e6f1
 2022-03-21 21:22:19 -07:00
Rahul Frias
587516dfa2 Return error first if the returned status is not ok 
[ Merge of http://go/wvgerrit/148249 ]

Bug: 224375138
Test: GtsMediaDrmTests
Change-Id: I10f0c1bc28342d6cd5ae7d373ef554321bb6d3c8
 2022-03-21 14:43:54 -07:00
Rahul Frias
b07523f4c6 Constrain the generated key type in testing 
[ Merge of http://go/wvgerrit/148157 ]

Fail the test if the returned type is other values.

Bug: 224375138
Test: GtsMediaDrmTests
Change-Id: I4abad9d69865cac99654d3dedd443463dd728a58
 2022-03-21 14:41:01 -07:00
Rahul Frias
a6a99c416f Free EC key in test session destructor 
[ Merged from http://go/wvgerrit/148030 ]

Bug: 224375138
Test: GtsMediaDrmTests
Change-Id: Ic1d42756cb1a03fa52d90c5fb0bd496e87a43c65
 2022-03-21 14:37:58 -07:00
Alex Dale
1fac6fa5de Added key_session_ guard to SelectKey. 
[ Merge of http://go/wvgerrit/148158 ]
[ Cherry pick of http://ag/16982989 ]

A rare race condition was found where a key is selected as the session
is closed.  This results in a null pointer dereference in
CryptoSession::SelectKey().  Two additional checks have been added to
SelectKey() to prevent this from occuring.

Bug: 217749078
Test: CDM unit tests, atest GtsMediaTestCases
Change-Id: Iec390cc7d1f28ddc18a30a68bc78922ec4fdbb89
(cherry picked from commit 1cd85a6b79)
 2022-03-18 21:06:51 +00:00
Rahul Frias
31d2dc1658 Merge changes from topics "presubmit-am-0d92e9728c2d40da892bd450843310cb", "presubmit-am-11f8881adcb544ca8682231293b0f1c7", "presubmit-am-30bc14671b7b4b309e57b8600f46b32b", "presubmit-am-35012549d66140dd9d446b5eedf6e274", "presubmit-am-374672395de04b7b8f697a54e16be928", "presubmit-am-48d77602d3694ced89dd6e82a89fa646", "presubmit-am-4f8d5681247e4064a298d1e5263c41be", "presubmit-am-89930436636343d5a779bc06ccc307dc", "presubmit-am-904492a27e4449e78cf21dd9f4ab8ff0", "presubmit-am-90646715a3284730bf356bb6f4634729", "presubmit-am-a1ae313a0fde4696b7fb8c4390d3a94c", "presubmit-am-ae051fae1d06485ca7f12bcf265e8328", "presubmit-am-b4e6ace5be72409aab8e328c6f2a0288", "presubmit-am-dd16b680e0454031b2213179b22df7d7", "presubmit-am-e249264532da4839841f4cab3675fa61", "presubmit-am-e3a2f43ba2f84f429536270e16d0d251", "presubmit-am-e5f2e7a319d04b89950c63471d7f2458", "presubmit-am-ea47ff378925466c8c92e2ed9b58c461", "presubmit-am-f582c497c3274c7e84606cf3da4b09df" into tm-dev am: cff6103321 am: 26dbb06de3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17182326

Change-Id: Idb3413e0e7aae4d7d9b76a005fae626b7f1d51cd
 2022-03-17 18:22:46 +00:00
Rahul Frias
26dbb06de3 Merge changes from topics "presubmit-am-0d92e9728c2d40da892bd450843310cb", "presubmit-am-11f8881adcb544ca8682231293b0f1c7", "presubmit-am-30bc14671b7b4b309e57b8600f46b32b", "presubmit-am-35012549d66140dd9d446b5eedf6e274", "presubmit-am-374672395de04b7b8f697a54e16be928", "presubmit-am-48d77602d3694ced89dd6e82a89fa646", "presubmit-am-4f8d5681247e4064a298d1e5263c41be", "presubmit-am-89930436636343d5a779bc06ccc307dc", "presubmit-am-904492a27e4449e78cf21dd9f4ab8ff0", "presubmit-am-90646715a3284730bf356bb6f4634729", "presubmit-am-a1ae313a0fde4696b7fb8c4390d3a94c", "presubmit-am-ae051fae1d06485ca7f12bcf265e8328", "presubmit-am-b4e6ace5be72409aab8e328c6f2a0288", "presubmit-am-dd16b680e0454031b2213179b22df7d7", "presubmit-am-e249264532da4839841f4cab3675fa61", "presubmit-am-e3a2f43ba2f84f429536270e16d0d251", "presubmit-am-e5f2e7a319d04b89950c63471d7f2458", "presubmit-am-ea47ff378925466c8c92e2ed9b58c461", "presubmit-am-f582c497c3274c7e84606cf3da4b09df" into tm-dev am: cff6103321 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17182326

Change-Id: Id1ac07fad013e471a13d4585ae82d4b481bb67b6
 2022-03-17 17:36:54 +00:00
Rahul Frias
f53715e25d Merge changes from topics "presubmit-am-0d92e9728c2d40da892bd450843310cb", "presubmit-am-11f8881adcb544ca8682231293b0f1c7", "presubmit-am-30bc14671b7b4b309e57b8600f46b32b", "presubmit-am-35012549d66140dd9d446b5eedf6e274", "presubmit-am-374672395de04b7b8f697a54e16be928", "presubmit-am-48d77602d3694ced89dd6e82a89fa646", "presubmit-am-4f8d5681247e4064a298d1e5263c41be", "presubmit-am-89930436636343d5a779bc06ccc307dc", "presubmit-am-904492a27e4449e78cf21dd9f4ab8ff0", "presubmit-am-90646715a3284730bf356bb6f4634729", "presubmit-am-a1ae313a0fde4696b7fb8c4390d3a94c", "presubmit-am-ae051fae1d06485ca7f12bcf265e8328", "presubmit-am-b4e6ace5be72409aab8e328c6f2a0288", "presubmit-am-dd16b680e0454031b2213179b22df7d7", "presubmit-am-e249264532da4839841f4cab3675fa61", "presubmit-am-e3a2f43ba2f84f429536270e16d0d251", "presubmit-am-e5f2e7a319d04b89950c63471d7f2458", "presubmit-am-ea47ff378925466c8c92e2ed9b58c461", "presubmit-am-f582c497c3274c7e84606cf3da4b09df" into tm-dev am: cff6103321 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17182326

Change-Id: I07a3c784e998ef295219e1d60a230ad74c20cc5d
 2022-03-17 17:36:42 +00:00
Rahul Frias
cff6103321 Merge changes from topics "presubmit-am-0d92e9728c2d40da892bd450843310cb", "presubmit-am-11f8881adcb544ca8682231293b0f1c7", "presubmit-am-30bc14671b7b4b309e57b8600f46b32b", "presubmit-am-35012549d66140dd9d446b5eedf6e274", "presubmit-am-374672395de04b7b8f697a54e16be928", "presubmit-am-48d77602d3694ced89dd6e82a89fa646", "presubmit-am-4f8d5681247e4064a298d1e5263c41be", "presubmit-am-89930436636343d5a779bc06ccc307dc", "presubmit-am-904492a27e4449e78cf21dd9f4ab8ff0", "presubmit-am-90646715a3284730bf356bb6f4634729", "presubmit-am-a1ae313a0fde4696b7fb8c4390d3a94c", "presubmit-am-ae051fae1d06485ca7f12bcf265e8328", "presubmit-am-b4e6ace5be72409aab8e328c6f2a0288", "presubmit-am-dd16b680e0454031b2213179b22df7d7", "presubmit-am-e249264532da4839841f4cab3675fa61", "presubmit-am-e3a2f43ba2f84f429536270e16d0d251", "presubmit-am-e5f2e7a319d04b89950c63471d7f2458", "presubmit-am-ea47ff378925466c8c92e2ed9b58c461", "presubmit-am-f582c497c3274c7e84606cf3da4b09df" into tm-dev 
* changes:
  Change the signature format requirement of OEMCrypto_GenerateCertificateKeyPair
  Fix EnsureProvisioned for double provisioning
  Update fuzz tests to match output desriptor struct
  Use default url to inform app of prov40 stages
  Fix key_control_iv in OEMCrypto tests
  Fix jenkins/opk_optee after v17 merge
  Remove old test license holder
  Generic crypto tests: use license holder
  Reboot tests: verify offline license is valid after reboot
  Policy integration tests: use license holder
  Integration tests: add license holder
  Reboot test: Initialize fake clock
  Reboot test: save large files
  Test max number of DRM private keys
  Merge oemcrypto-v17 to master
  Update cipher mode elsewhere
  Fix 1 ClangTidyBuild finding:
  Add out of bounds testing for LoadKeys()
  Separate invalid session test for ReuseUsageEntry
 2022-03-17 16:39:36 +00:00