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

3477 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rahul Frias
ed587da19c Merge "Correct android version number in test" into qt-dev am: 48650f74ab 
am: df19f4f85d

Change-Id: I3a368a1ecc9ede92316959aa2a85921a5b7ba95d
 2019-05-17 07:41:23 -07:00
Rahul Frias
766a15693a Merge "Correct android version number in test" into qt-dev am: 48650f74ab 
am: 5b3a43b17c

Change-Id: I17391063e8fa00b1315fc1cce5d9139636a1f95d
 2019-05-17 07:41:18 -07:00
Rahul Frias
5b3a43b17c Merge "Correct android version number in test" into qt-dev 
am: 48650f74ab

Change-Id: I277f13f636b2f8c74accfb741de814090772d12c
 2019-05-17 07:38:18 -07:00
Rahul Frias
df19f4f85d Merge "Correct android version number in test" into qt-dev 
am: 48650f74ab

Change-Id: I7107bf359368736a7e63e9fd98408360d79b9f02
 2019-05-17 07:36:16 -07:00
Rahul Frias
48650f74ab Merge "Correct android version number in test" into qt-dev 2019-05-17 14:23:01 +00:00
Robert Shih
860d3ef467 Add CdmKeyStatus kKeyStatusUsableInFuture am: 69c8f488ca am: 790b97e308 
am: e91e7142ae

Change-Id: Id3cea4ce03554b38175fde868dbbed2fdac322d0
 2019-05-17 00:15:49 -07:00
Robert Shih
fe8924f814 Add CdmKeyStatus kKeyStatusUsableInFuture am: 69c8f488ca am: 6a329e6c9a 
am: e6ba3ec747

Change-Id: Iee17c92d9a3f3fd390e05bb0324ba04861236210
 2019-05-16 20:07:33 -07:00
Fred Gylys-Colwell
f3b65702ca Merge "Address review comments for OEMCrypto Build Information" 2019-05-17 01:19:56 +00:00
Fred Gylys-Colwell
b85766a7f0 Merge "Disable failures for LoadKeyWithSuspiciousIV and SelectKeyNotThereAPI15" into qt-dev am: 3454ccf51e 
am: af4ba75658

Change-Id: Iada8a7560d99caf9c07a6c99f8d39cf39fa83f98
 2019-05-16 17:45:51 -07:00
Fred Gylys-Colwell
5a9ef9a128 Merge "Disable failures for LoadKeyWithSuspiciousIV and SelectKeyNotThereAPI15" into qt-dev am: 3454ccf51e 
am: d579bbf511

Change-Id: Ifc105c1fe69b8c2ddd2abfaee70482f5d80c4744
 2019-05-16 17:23:18 -07:00
Fred Gylys-Colwell
af4ba75658 Merge "Disable failures for LoadKeyWithSuspiciousIV and SelectKeyNotThereAPI15" into qt-dev 
am: 3454ccf51e

Change-Id: Ibf2dd62f0a04fc3b21cfb793966c4854af66fa1b
 2019-05-16 15:43:59 -07:00
Fred Gylys-Colwell
d579bbf511 Merge "Disable failures for LoadKeyWithSuspiciousIV and SelectKeyNotThereAPI15" into qt-dev 
am: 3454ccf51e

Change-Id: Ia495d1b2140052e302442957fc134b1a382167f4
 2019-05-16 15:34:06 -07:00
Rahul Frias
4f273991b9 Correct android version number in test 
[ Merge of http://go/wvgerrit/79144 ]

Bug: 132908020
Test: WV unit/integration tests
Change-Id: Idf5cf3e1e886af3bfed157320fa09d66dfa55c0d
 2019-05-16 14:44:40 -07:00
TreeHugger Robot
3454ccf51e Merge "Disable failures for LoadKeyWithSuspiciousIV and SelectKeyNotThereAPI15" into qt-dev 2019-05-16 20:34:18 +00:00
Srujan Gaddam
189eb87977 Change move_widevine_data.sh to move L3 files 
Bug: b/130252305
Test: nyc-mr2-release -> pi-dev, oc-mr1-release -> pi-dev
nyc-mr2-release -> oc-mr1-release -> pi-dev upgrades with offline
licenses
Merge of http://go/ag/7323341

In N, the L3 files were stored in /data/mediadrm/IDM[uid]/. In O, they
were moved to /data/mediadrm/IDM[uid]/L3/. In P, we moved the contents
of mediadrm to /data/vendor/mediadrm/. For an O->P upgrade, the L3 files
can be read in /data/vendor/mediadrm/IDM[uid]/L3/, but when we upgrade
N->P, the L3 files sit in /data/vendor/mediadrm/IDM[uid]/, unable to be
read. This CL addresses this issue by changing the script to move any L3
files if they exist under this directory to the L3 subdirectory after we
do the bulk move from /data/mediadrm/ to /data/vendor/mediadrm/.

Change-Id: I319c323879766df063d25478046367878023a7cf
(cherry picked from commit 1a6ca36976)
 2019-05-16 20:25:54 +00:00
Fred Gylys-Colwell
e4c7bc38f8 Address review comments for OEMCrypto Build Information 
Merge of http://go/wvgerrit/78683

There were some review comments in http://go/wvgerrit/78683 that came
in after the code was merged to the qt-dev branch.  This CL addresses
them on the master branch.

Test: unit tests.
Bug: 129070445
 2019-05-16 18:32:16 +00:00
Robert Shih
e91e7142ae Add CdmKeyStatus kKeyStatusUsableInFuture am: 69c8f488ca 
am: 790b97e308

Change-Id: I9b26a7e96e18bfd5ee09f6f1b6e0d70b6ed6ba29
 2019-05-16 07:15:25 -07:00
Robert Shih
e6ba3ec747 Add CdmKeyStatus kKeyStatusUsableInFuture am: 69c8f488ca 
am: 6a329e6c9a

Change-Id: I8ef098e22f36600ae5a6b445a5ecc9f85dcf8d3b
 2019-05-15 22:41:49 -07:00
Robert Shih
790b97e308 Add CdmKeyStatus kKeyStatusUsableInFuture 
am: 69c8f488ca

Change-Id: I52badea000aed68899c235f2c769a794000934a6
 2019-05-15 18:32:40 -07:00
Robert Shih
6a329e6c9a Add CdmKeyStatus kKeyStatusUsableInFuture 
am: 69c8f488ca

Change-Id: I3e98ea3f206086514060d6902fccfa6e6d826a85
 2019-05-15 18:32:20 -07:00
Srujan Gaddam
fa60c58344 Merge "Update Level 3 to OEMCrypto v15.2" 2019-05-15 22:49:21 +00:00
Robert Shih
69c8f488ca Add CdmKeyStatus kKeyStatusUsableInFuture 
Bug: 116738851
Test: unit tests
Change-Id: I49728788e57905806b72e891f3654fbf0c8b1bc0
 2019-05-15 15:16:05 -07:00
Fred Gylys-Colwell
29becbc2bf Disable failures for LoadKeyWithSuspiciousIV and SelectKeyNotThereAPI15 
Merge from Widevine repo of http://go/wvgerrit/78949

LoadKeyWithSuspiciousIV is a new test for OEMCrypto v15.2.  It is
being disabled since we do not require 15.2 for the Q release.

SelectKeyNotThereAPI15 was failing because the error code is
delayed. This is acceptable.

Bug: 132720732
Test: unit tests on taimen
Change-Id: Iea3fabfb3afd800065119ce812fb454be1e82644
 2019-05-14 22:32:54 -07:00
Fred Gylys-Colwell
567acef45c Merge "Fix OEMCrypto UsageTableTest.GenerateReportWrongPST" into qt-dev am: 127f87770c 
am: 770212b178

Change-Id: Id35fa3e4553a71aa8327a7c23f6bbc5e92ec99d1
 2019-05-14 18:01:12 -07:00
Fred Gylys-Colwell
843c8ab83a Merge "Fix OEMCrypto UsageTableTest.GenerateReportWrongPST" into qt-dev am: 127f87770c am: e4eef77a01 
am: 8a104ddc65

Change-Id: Ifbb57ea1111add3c018a6c115f9337c5594d6b79
 2019-05-14 16:56:10 -07:00
Rahul Frias
f5fc017e78 Merge "Ref count Timer implementation" into qt-dev am: ed833222a6 
am: 112fd43208

Change-Id: I6eca34ef158a74675505dbe53b37b0eef2e3abf5
 2019-05-14 16:54:13 -07:00
Rahul Frias
06e65fc383 Merge "Single PSSH entitlement handling" into qt-dev am: 19c6e57269 
am: f9f9aef3b9

Change-Id: I8b0286c8d376a3e2e6c1566221c172b883d6be3a
 2019-05-14 16:52:24 -07:00
Rahul Frias
ada42ea839 Merge "Key Status should reflect key container security level" into qt-dev am: 80f5e283ad 
am: ba774bcc0b

Change-Id: Id41b16f5c392af4b4e4da1ed3ed0122cab7524fe
 2019-05-14 16:50:40 -07:00
Fred Gylys-Colwell
2381f9b187 Report OEMCrypto Build Information in License Request am: 5ee5d00514 
am: 1b766afb51

Change-Id: I191705fc2b82e4ee9c4dc2ca5a124b459570437c
 2019-05-14 16:47:05 -07:00
Adam Stone
b10fa7c209 Merge "Correctly sets provisioning state for test." into qt-dev am: c71fb10b95 
am: 0b47db66a2

Change-Id: I4d3cde36cd5fe453aa3359bc32aa90fc943a596d
 2019-05-14 16:44:56 -07:00
John Bruce
b342ad389b Merge "Disallow Blank App Package Name on Q and Later" into qt-dev am: 8a0ba4d0fa 
am: 0fa4cc664d

Change-Id: I033df67ef5b94e7d9fe9b960e88fc613b341f2d0
 2019-05-14 16:41:20 -07:00
Fred Gylys-Colwell
6a4a3d9929 Merge "Update unit tests for v15.2" into qt-dev am: 2f79fe2773 
am: 99a6c8a10d

Change-Id: I8e3c1b979865245e5706be0742a16409e931370a
 2019-05-14 16:37:44 -07:00
Jeff Tinker
0d0ccae089 Merge "hidl plugin: add sendKeysChange_1_2" into qt-dev am: 83068b97c8 
am: 85590f243e

Change-Id: Ifc433e2179fbae4d59a6b38f2d6359cf943f90ab
 2019-05-14 16:33:43 -07:00
Fred Gylys-Colwell
44962e3684 Test MAC signature after license reload am: 407d39699b 
am: e36786cca8

Change-Id: Id4c2c93b696465f129bd4a3a4f5d59fc09152693
 2019-05-14 16:29:51 -07:00
Fred Gylys-Colwell
ebf930796b Merge "Test loading second call to LoadKeys fails" into qt-dev am: a1e94e2eb1 
am: 666ba585c4

Change-Id: Icaea671848995b566f6f1e7d870becfac2ffbc10
 2019-05-14 16:20:15 -07:00
Fred Gylys-Colwell
f9c3c2022e Merge "Update docs for OEMCrypto v15.2" into qt-dev am: 3b9b77c7c7 
am: c876186cf8

Change-Id: Ie5e6c7abf406c031716fba0e47ec9bd5d1ede593
 2019-05-14 16:12:40 -07:00
Rahul Frias
fcf39dfe7c Merge "Handle key rotation" into qt-dev am: 862cb96e77 
am: 544a04b334

Change-Id: I57b22cdae29220147002f5cbaf564a177acb782f
 2019-05-14 16:05:46 -07:00
Fred Gylys-Colwell
8a104ddc65 Merge "Fix OEMCrypto UsageTableTest.GenerateReportWrongPST" into qt-dev am: 127f87770c 
am: e4eef77a01

Change-Id: If5700421bb316aab19a728ed4f74f715bed80d1b
 2019-05-14 15:52:06 -07:00
Fred Gylys-Colwell
770212b178 Merge "Fix OEMCrypto UsageTableTest.GenerateReportWrongPST" into qt-dev 
am: 127f87770c

Change-Id: I52830d09aba181a8545f9978e094a55c366c0249
 2019-05-14 15:29:54 -07:00
Fred Gylys-Colwell
e4eef77a01 Merge "Fix OEMCrypto UsageTableTest.GenerateReportWrongPST" into qt-dev 
am: 127f87770c

Change-Id: I5d8e5dc444e7bf606aed1f133cae60c26a917cc5
 2019-05-14 15:23:40 -07:00
TreeHugger Robot
127f87770c Merge "Fix OEMCrypto UsageTableTest.GenerateReportWrongPST" into qt-dev 2019-05-14 22:01:11 +00:00
Srujan Gaddam
50c555336d Update Level 3 to OEMCrypto v15.2 
Bug: b/132083217
Test: Linux, CE CDM, and Android unit/integration tests
Merge of http://go/wvgerrit/78946

This CL checks nonce collisions, checks iv offset compared to mac_keys
offset, checks the memory before the mac_keys to the iv, and clears the
encryption key after a LoadKeys call.

Change-Id: Ic8e4bcd6ee4512d93ef88583f337cfdf00c58fb0
 2019-05-14 21:00:37 +00:00
Rahul Frias
090d9d409b Merge "Ref count Timer implementation" into qt-dev am: ed833222a6 
am: 389d917e88

Change-Id: Ie51744931c38b5e4b0bc8110b07fee9d229870f9
 2019-05-13 14:23:19 -07:00
Rahul Frias
389d917e88 Merge "Ref count Timer implementation" into qt-dev 
am: ed833222a6

Change-Id: I262e1e87613bdd920014d3385427eedb792f9725
 2019-05-13 13:57:13 -07:00
Rahul Frias
112fd43208 Merge "Ref count Timer implementation" into qt-dev 
am: ed833222a6

Change-Id: I6ff3c108dccebb46b7d41da0eba727401bba71de
 2019-05-13 13:53:30 -07:00
Rahul Frias
ed833222a6 Merge "Ref count Timer implementation" into qt-dev 2019-05-13 20:24:45 +00:00
Rahul Frias
c9c3e6ab6f Merge "Single PSSH entitlement handling" into qt-dev am: 19c6e57269 
am: f13e62fbe3

Change-Id: Ib06c9f6606fab960a132d1fb0876108cd7513c2d
 2019-05-13 09:49:41 -07:00
Rahul Frias
f1bb063682 Merge "Key Status should reflect key container security level" into qt-dev am: 80f5e283ad 
am: 555d7cdc83

Change-Id: Ib3c97a96e8482fafc888d71780daa047cc6428ac
 2019-05-13 09:49:24 -07:00
Rahul Frias
f9f9aef3b9 Merge "Single PSSH entitlement handling" into qt-dev 
am: 19c6e57269

Change-Id: Ie11018d844b1d43862815a72ca185a980ddd1f76
 2019-05-13 09:45:04 -07:00
Rahul Frias
f13e62fbe3 Merge "Single PSSH entitlement handling" into qt-dev 
am: 19c6e57269

Change-Id: I25d63ee6411211a231534191f703f43b893d2524
 2019-05-13 09:45:01 -07:00