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

3587 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
09d4f2b535 Merge "CDM handles mixed output warnings." into rvc-dev am: d3f10ece7c am: bbf7f28831 
Change-Id: Ie8b36f165c74fc8fbebd636a3efc8e81bb3393e1
 2020-03-02 18:54:48 +00:00
Automerger Merge Worker
bbf7f28831 Merge "CDM handles mixed output warnings." into rvc-dev am: d3f10ece7c 
Change-Id: Ia54a736025a3fe6eab32ab616947785f98e68ac3
 2020-03-02 18:44:17 +00:00
Automerger Merge Worker
cfb91676e9 Merge "CDM handles mixed output warnings." into rvc-dev am: d3f10ece7c 
Change-Id: I8fcebbe44c80c38448915cff2ef506ccedc32865
 2020-03-02 18:43:58 +00:00
Alex Dale
d3f10ece7c Merge "CDM handles mixed output warnings." into rvc-dev 2020-03-02 18:35:13 +00:00
Automerger Merge Worker
d25dc0c09e Merge "Use staging provisioning server even more" into rvc-dev am: b73c015557 am: fa58da183b am: 92422fe4f1 
Change-Id: I02b0c1e57e34f7d6b4e4e7cbdfa0974cac3de65e
 2020-02-29 02:24:53 +00:00
Automerger Merge Worker
7d128f56a4 Merge "Use staging provisioning server even more" into rvc-dev am: b73c015557 am: b604a114fa am: c80a6473d9 
Change-Id: I888b308a5eedb367ba06604e193476d309dabbb1
 2020-02-29 02:24:42 +00:00
Automerger Merge Worker
9875b5a130 Merge "Use staging provisioning server even more" into rvc-dev am: b73c015557 am: fa58da183b am: a035e72daf 
Change-Id: I4516ca29b91ba5e26e82ede014c3ea17cacb27e1
 2020-02-29 02:24:30 +00:00
Automerger Merge Worker
92422fe4f1 Merge "Use staging provisioning server even more" into rvc-dev am: b73c015557 am: fa58da183b 
Change-Id: I5ea942e7bea3e15e22137c33455181936b85f326
 2020-02-29 02:12:37 +00:00
Automerger Merge Worker
c80a6473d9 Merge "Use staging provisioning server even more" into rvc-dev am: b73c015557 am: b604a114fa 
Change-Id: I4a71190a313d2442cc15d7ce63fdbc5d9637f952
 2020-02-29 02:12:31 +00:00
Automerger Merge Worker
a035e72daf Merge "Use staging provisioning server even more" into rvc-dev am: b73c015557 am: fa58da183b 
Change-Id: I77974a8abf1e860ae127842b7e01d91833729ff0
 2020-02-29 02:12:19 +00:00
Automerger Merge Worker
b604a114fa Merge "Use staging provisioning server even more" into rvc-dev am: b73c015557 
Change-Id: Idd16ce804b03e6eca5c5b40411b2455ef9b8780e
 2020-02-29 01:57:40 +00:00
Automerger Merge Worker
fa58da183b Merge "Use staging provisioning server even more" into rvc-dev am: b73c015557 
Change-Id: I5df3c9e50fec4cf8fedc7dbc72905410a37822da
 2020-02-29 01:57:38 +00:00
Fred Gylys-Colwell
b73c015557 Merge "Use staging provisioning server even more" into rvc-dev 2020-02-29 01:44:38 +00:00
Alex Dale
fb5c67929f CDM handles mixed output warnings. 
[ Merge of http://go/wvgerrit/94483 ]

With OEMCrypto V16 comes a new potential error code from calls to
DecryptCENC().  WARNING_MIXED_OUTPUT_PROTECTION may be returned by
supporting devices if one of the output devices does not meet the
required HDCP level for the decryption key/license; however the output
is instead restricted (by OEMCrypto) to devices that are secure. This
warning is informative to the CDM; but no action can/should be taken
by the CDM.

In addition, if DecryptCENC() returns an error/warning, it is likely
that the same status code will be returned on subsequent calls to
decrypt within the same crypto session.  To reduce the number of logs
the CDM produces within the same crypto session only changes in error
codes are logged.

Bug: 140825538
Change-Id: Iaf9da3f0c88889525f73f3153a5977c8416286bb
(cherry picked from commit d9c703ef9e)
Merged-In: Iaf9da3f0c88889525f73f3153a5977c8416286bb
 2020-02-29 01:24:12 +00:00
Fred Gylys-Colwell
1c8fac32d3 Use staging provisioning server even more 
Merge from Widevine repo of http://go/wvgerrit/94745

I missed a few in http://go/wvgerrit/94067

Test: ran unit tests
Bug: 149622735
Change-Id: I2289adb05bbd41376528e09bbaa62430644a3e20
 2020-02-29 00:50:04 +00:00
Rahul Frias
951ec2c6f5 Correct log messages 
[ Merge of http://go/wvgerrit/94903 ]

Prefixes are no longer needed now that file and line number are
being logged.

Bug: 149829271
Test: wv unit/integration tests
Change-Id: I0ba701fc262cdb59056dca139c38ed76035bcbb8
 2020-02-28 15:19:36 -08:00
Automerger Merge Worker
72a766f338 Merge "Add odk_test to platform tests" into rvc-dev am: 5ebb430af7 am: 440b864da3 am: 645bd40a5a 
Change-Id: I8880f7f46d1da5cd5027539fef645955aa574b30
 2020-02-28 03:11:03 +00:00
Automerger Merge Worker
b733e67adc Merge "Add odk_test to platform tests" into rvc-dev am: 5ebb430af7 am: 013fff3618 am: c2387ab507 
Change-Id: I6f04c24d9be3b24ae281c5f1620ae2839e25b3f9
 2020-02-28 03:10:55 +00:00
Automerger Merge Worker
bfce5afcce Merge "Add odk_test to platform tests" into rvc-dev am: 5ebb430af7 am: 440b864da3 am: 53ec720bfc 
Change-Id: Id157c9a12964a19487b7388e019e2c0c1ace2442
 2020-02-28 03:10:49 +00:00
Automerger Merge Worker
c2387ab507 Merge "Add odk_test to platform tests" into rvc-dev am: 5ebb430af7 am: 013fff3618 
Change-Id: Icbfce4669bf2dc6889c8a6eb3dc029b0ff9a6b83
 2020-02-28 02:54:35 +00:00
Automerger Merge Worker
645bd40a5a Merge "Add odk_test to platform tests" into rvc-dev am: 5ebb430af7 am: 440b864da3 
Change-Id: I96734ebe2f43c8aa2c394e072afd44ec15ba600c
 2020-02-28 02:54:34 +00:00
Automerger Merge Worker
53ec720bfc Merge "Add odk_test to platform tests" into rvc-dev am: 5ebb430af7 am: 440b864da3 
Change-Id: I39878e94de6640b3a58d3d6fb829df89dfd6d245
 2020-02-28 02:54:14 +00:00
Automerger Merge Worker
013fff3618 Merge "Add odk_test to platform tests" into rvc-dev am: 5ebb430af7 
Change-Id: I7c3466b42ad6512831e49181cd09fa92e5719b01
 2020-02-28 02:43:44 +00:00
Automerger Merge Worker
440b864da3 Merge "Add odk_test to platform tests" into rvc-dev am: 5ebb430af7 
Change-Id: I6986db3399629f65af8e74d254b3e5a7736ea6a2
 2020-02-28 02:43:41 +00:00
TreeHugger Robot
5ebb430af7 Merge "Add odk_test to platform tests" into rvc-dev 2020-02-28 02:26:50 +00:00
Automerger Merge Worker
1e464933ec Merge "Search for test executables in odk_test" into rvc-dev am: 6373ff35ca am: c4804925ed am: 0e2adab96f 
Change-Id: I001b3d097d4fd21a13a8a91cd37fa6fee2169097
 2020-02-28 00:38:43 +00:00
Automerger Merge Worker
30f9881e05 Merge "Search for test executables in odk_test" into rvc-dev am: 6373ff35ca am: 50a831a37e am: 0d9d17a748 
Change-Id: Id3a603ed217462c7b9925f1ec5a487f363349d14
 2020-02-28 00:33:40 +00:00
Automerger Merge Worker
d8454fdc54 Merge "Search for test executables in odk_test" into rvc-dev am: 6373ff35ca am: c4804925ed am: 97698623e6 
Change-Id: I6e483c94291de3862f20a869a47e59710a3b4576
 2020-02-28 00:26:04 +00:00
Automerger Merge Worker
0e2adab96f Merge "Search for test executables in odk_test" into rvc-dev am: 6373ff35ca am: c4804925ed 
Change-Id: I04e4e66881432fa8aed5af33d9227db5faef706f
 2020-02-28 00:18:40 +00:00
Automerger Merge Worker
0d9d17a748 Merge "Search for test executables in odk_test" into rvc-dev am: 6373ff35ca am: 50a831a37e 
Change-Id: I00f12b28f3752b7f69a6504f16f01c471912fbd5
 2020-02-28 00:18:13 +00:00
Automerger Merge Worker
97698623e6 Merge "Search for test executables in odk_test" into rvc-dev am: 6373ff35ca am: c4804925ed 
Change-Id: I9c048e3899fc252f4319a35f19665376d34d958e
 2020-02-28 00:14:28 +00:00
Automerger Merge Worker
c4804925ed Merge "Search for test executables in odk_test" into rvc-dev am: 6373ff35ca 
Change-Id: Iadc7390665edb0324437d35e350fb8994a88c63c
 2020-02-28 00:04:21 +00:00
Automerger Merge Worker
50a831a37e Merge "Search for test executables in odk_test" into rvc-dev am: 6373ff35ca 
Change-Id: I3e31324bfb2c681edb225999c98ff7218ed866df
 2020-02-28 00:00:01 +00:00
Rahul Frias
6373ff35ca Merge "Search for test executables in odk_test" into rvc-dev 2020-02-27 23:47:56 +00:00
Robert Shih
b1ee517ff1 Add odk_test to platform tests 
Bug: 150158890
Test: build & inspect platform_tests.zip
Change-Id: I06c0acd0f7fed168e8e2ad876a58983b11d9b43f
 2020-02-27 21:35:30 +00:00
Automerger Merge Worker
ff8d2a9bc1 Fix nonce problem in license renewal am: 0947bd185b am: 54a2a92988 am: 5e6aaefc69 
Change-Id: Idcff26d7bf586730b2e97110740a4f6193df9763
 2020-02-27 20:53:25 +00:00
Automerger Merge Worker
6c775f9e64 Fix nonce problem in license renewal am: 0947bd185b am: e8406c63fd am: 161d7b9f08 
Change-Id: I967638f06930da9bf6e14f603662f28aa4fe6a1b
 2020-02-27 20:53:16 +00:00
Automerger Merge Worker
a8770bd08d Fix nonce problem in license renewal am: 0947bd185b am: e8406c63fd am: af930f2cc4 
Change-Id: I5ae3ebfe975bd51be967c4994e7832eeb4bb56b3
 2020-02-27 20:52:56 +00:00
Automerger Merge Worker
5e6aaefc69 Fix nonce problem in license renewal am: 0947bd185b am: 54a2a92988 
Change-Id: I4330802d905f4bb48e5d2423ac2bf58491f51107
 2020-02-27 20:37:03 +00:00
Automerger Merge Worker
161d7b9f08 Fix nonce problem in license renewal am: 0947bd185b am: e8406c63fd 
Change-Id: Ib3d73959e7399a413bc1b93661efe54698b0b799
 2020-02-27 20:37:03 +00:00
Automerger Merge Worker
af930f2cc4 Fix nonce problem in license renewal am: 0947bd185b am: e8406c63fd 
Change-Id: I26567ab69b4c3f347800b77230b09811f9b2c75f
 2020-02-27 20:36:37 +00:00
Fred Gylys-Colwell
e8406c63fd Fix nonce problem in license renewal 
am: 0947bd185b

Change-Id: Ibeb92f4598af6bcf414f6757e8b9816d9988751e
 2020-02-27 12:24:29 -08:00
Fred Gylys-Colwell
54a2a92988 Fix nonce problem in license renewal 
am: 0947bd185b

Change-Id: Ic1bc6c3a83ff64d09bafac0a3851fa26973139a3
 2020-02-27 12:24:26 -08:00
Automerger Merge Worker
a645da282f Change some test EXPECT to ASSERT to avoid segfaults am: 7f006997cb am: 938bfe1a40 am: f81fe480eb 
Change-Id: Id1e10558b56f89dfb79cd88db9d9bc62ef3c5724
 2020-02-27 05:24:44 +00:00
Automerger Merge Worker
f81fe480eb Change some test EXPECT to ASSERT to avoid segfaults am: 7f006997cb am: 938bfe1a40 
Change-Id: I41d5a8eeb38cf874255318b96cfbc72e04bd985f
 2020-02-27 04:59:07 +00:00
Automerger Merge Worker
3765558218 Change some test EXPECT to ASSERT to avoid segfaults am: 7f006997cb am: 938bfe1a40 am: 566e2448d2 
Change-Id: I8a0cdba1a54fb227877ca83bbad6489ec48cdd5b
 2020-02-27 04:55:52 +00:00
Automerger Merge Worker
566e2448d2 Change some test EXPECT to ASSERT to avoid segfaults am: 7f006997cb am: 938bfe1a40 
Change-Id: I1d2481c8f87978600dcdb052b0f4370a7c1c6b99
 2020-02-27 04:53:36 +00:00
Automerger Merge Worker
7d02410a43 Change some test EXPECT to ASSERT to avoid segfaults am: 7f006997cb am: 69b6019d39 am: 81a9803241 
Change-Id: I6f34afe4b3f056a9ed7d0fa9f54ebf559801f2c6
 2020-02-27 04:48:38 +00:00
Automerger Merge Worker
81a9803241 Change some test EXPECT to ASSERT to avoid segfaults am: 7f006997cb am: 69b6019d39 
Change-Id: Ia90b035b76a3bd9e6a28529fd197710e6a336e36
 2020-02-27 04:39:10 +00:00
Automerger Merge Worker
69b6019d39 Change some test EXPECT to ASSERT to avoid segfaults am: 7f006997cb 
Change-Id: I5f62b43edd5898bda5c4c06ee44bb34b62e5a9e6
 2020-02-27 04:08:11 +00:00