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
Rahul Frias
ba774bcc0b
Merge "Key Status should reflect key container security level" into qt-dev
...
am: 80f5e283ad
Change-Id: Ice98e223f2f278961ad304ba180940fb0e091131
2019-05-13 09:44:44 -07:00
Rahul Frias
555d7cdc83
Merge "Key Status should reflect key container security level" into qt-dev
...
am: 80f5e283ad
Change-Id: I1ec42a96781f33efb46a902d6542ccef9d5eefb2
2019-05-13 09:44:39 -07:00
Rahul Frias
19c6e57269
Merge "Single PSSH entitlement handling" into qt-dev
2019-05-13 16:26:16 +00:00
Rahul Frias
80f5e283ad
Merge "Key Status should reflect key container security level" into qt-dev
2019-05-13 16:25:24 +00:00
Rahul Frias
4d917e3ee8
Ref count Timer implementation
...
[ Merge of http://go/wvgerrit/78763 ]
The android timer instance is held by a regular pointer rather
than reference counted as all classes that derive from RefBase
should be. This could result in a double deallocation, if the
timer is ever passed to a strong pointer.
Bug: 79364026
Test: WV unit/integration tests. GtsMediaTestCases. Play movies
playback tests.
Change-Id: I01f622bc045e1012f2240b3775a6d121f9415463
2019-05-12 02:15:12 -07:00
Fred Gylys-Colwell
878e39c740
Report OEMCrypto Build Information in License Request am: 5ee5d00514
...
am: 23c3bc8ebc
Change-Id: I1006614f9eadc97e9287816723ec179851bf2e67
2019-05-10 06:30:12 -07:00
Fred Gylys-Colwell
23c3bc8ebc
Report OEMCrypto Build Information in License Request
...
am: 5ee5d00514
Change-Id: I55c590b056d62d2b86002e0e880b42cf379da160
2019-05-10 01:49:56 -07:00
Fred Gylys-Colwell
1b766afb51
Report OEMCrypto Build Information in License Request
...
am: 5ee5d00514
Change-Id: If67feb3c826149e82f48d6e43fd82682c755f8fc
2019-05-10 01:27:07 -07:00
Rahul Frias
7d78609548
Key Status should reflect key container security level
...
[ Merge of http://go/wvgerrit/77506 ]
Callers of MediaDrm can register to be notified when key status
changes and if they are usable for decryption. A number of factors
are evaluated when making this determination. Key container security
level will now be included in the evaluation.
Bug: 78652608
Test: WV unit/integration test, GtsMediaDrmTest, Play movies playback
testing.
Change-Id: I20243e5cb160f7957e3239e8d05f715ff0ee6dd6
2019-05-09 22:16:23 -07:00
Fred Gylys-Colwell
5ee5d00514
Report OEMCrypto Build Information in License Request
...
Merge from Widevine repo of http://go/wvgerrit/78623
This updates the license request client identification to include
OEMCrypto build information.
Bug: 129070445
Test: ExoPlayer on crosshatch with mod mock
Change-Id: I0dbce0cca4e9810e14f60561e4e434f1dbcadfb6
2019-05-09 13:24:04 -07:00
Adam Stone
c653a9dadc
Merge "Correctly sets provisioning state for test." into qt-dev am: c71fb10b95
...
am: c47c1d7575
Change-Id: Ibad16685c1b1c2e25e73cbe3d4fb7430fc1c31df
2019-05-08 18:32:29 -07:00
Adam Stone
0b47db66a2
Merge "Correctly sets provisioning state for test." into qt-dev
...
am: c71fb10b95
Change-Id: I659abb94493f2f6f5a916a5a9cfb6dd8f00994c2
2019-05-08 17:37:19 -07:00
Adam Stone
c47c1d7575
Merge "Correctly sets provisioning state for test." into qt-dev
...
am: c71fb10b95
Change-Id: I2f96c088ae48f3d5fe6a1a9eac92d12db86b1271
2019-05-08 17:32:51 -07:00
Adam Stone
c71fb10b95
Merge "Correctly sets provisioning state for test." into qt-dev
2019-05-08 23:29:17 +00:00
Adam Stone
3a27d2d649
Correctly sets provisioning state for test.
...
[ Merge from http://go/wvgerrit/78383 ]
Bug: http://b/121049662
Test: Re-ran the unit test.
Change-Id: I62c00f425c93b588e123ddd8b1093177f2e9b241
2019-05-08 14:13:28 -07:00
John Bruce
f4f03565e1
Merge "Disallow Blank App Package Name on Q and Later" into qt-dev am: 8a0ba4d0fa
...
am: a10f45c497
Change-Id: If35f32eb963b631b7b44626d7dcebea9a32539bf
2019-05-08 13:10:24 -07:00
John Bruce
a10f45c497
Merge "Disallow Blank App Package Name on Q and Later" into qt-dev
...
am: 8a0ba4d0fa
Change-Id: I78e66451856fe930820fd658e9210e08d6e019e6
2019-05-08 12:33:36 -07:00
John Bruce
0fa4cc664d
Merge "Disallow Blank App Package Name on Q and Later" into qt-dev
...
am: 8a0ba4d0fa
Change-Id: I9a0bbd14b06d18196cc6e0041a56661d585107d2
2019-05-08 12:32:41 -07:00
John Bruce
8a0ba4d0fa
Merge "Disallow Blank App Package Name on Q and Later" into qt-dev
2019-05-08 18:58:40 +00:00
Fred Gylys-Colwell
cb12eacfc4
Merge "Update unit tests for v15.2" into qt-dev am: 2f79fe2773
...
am: d0b62c1b8d
Change-Id: I537e6e9c0161084cc0b12a32779fa52c275421cd
2019-05-08 11:38:46 -07:00
Jeff Tinker
fabf6f5311
Merge "hidl plugin: add sendKeysChange_1_2" into qt-dev am: 83068b97c8
...
am: 3caf992795
Change-Id: Ie49ca006a87f6071618c407b52a7d52992f0060c
2019-05-08 11:20:47 -07:00
Fred Gylys-Colwell
99a6c8a10d
Merge "Update unit tests for v15.2" into qt-dev
...
am: 2f79fe2773
Change-Id: Ia0a98f47f7d7d55b63df8c48a42de038f8cfdbd3
2019-05-08 11:07:50 -07:00
Fred Gylys-Colwell
d0b62c1b8d
Merge "Update unit tests for v15.2" into qt-dev
...
am: 2f79fe2773
Change-Id: Ibbb1647cf9d51bad0dc1c0c4ebb37fafd1108030
2019-05-08 11:07:48 -07:00
Jeff Tinker
85590f243e
Merge "hidl plugin: add sendKeysChange_1_2" into qt-dev
...
am: 83068b97c8
Change-Id: I3b1ce56a4960b64b9b4ac51a0e8479240cd1ec4a
2019-05-08 10:49:52 -07:00
Jeff Tinker
3caf992795
Merge "hidl plugin: add sendKeysChange_1_2" into qt-dev
...
am: 83068b97c8
Change-Id: I32757af27b94161ec1d22ffe9dcd0a1f203fcde2
2019-05-08 10:49:43 -07:00
Fred Gylys-Colwell
2f79fe2773
Merge "Update unit tests for v15.2" into qt-dev
2019-05-08 17:36:36 +00:00
Jeff Tinker
83068b97c8
Merge "hidl plugin: add sendKeysChange_1_2" into qt-dev
2019-05-08 17:17:43 +00:00
Fred Gylys-Colwell
a35722f358
Test MAC signature after license reload am: 407d39699b
...
am: a3d5e7be6a
Change-Id: Ia110288e7d06dcbe7aaebe6c54e42a64402f1a4f
2019-05-08 00:53:00 -07:00
Fred Gylys-Colwell
a3d5e7be6a
Test MAC signature after license reload
...
am: 407d39699b
Change-Id: I1ba07fb729841ccb009757022bc02228a93d75b8
2019-05-08 00:09:35 -07:00