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

3468 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
d3a42b6e85 hidl WVDrmPlugin openSession: set securityLevel correctly am: 9a530b7f1e am: 23c1be8cee am: 8f127f41cb am: 1aa1ee7170 am: 447cc2b6f7 
Change-Id: I719c77104c8519d2e1c33c9ae5e6c801bf2bc37f
 2020-03-04 20:35:43 +00:00
Automerger Merge Worker
447cc2b6f7 hidl WVDrmPlugin openSession: set securityLevel correctly am: 9a530b7f1e am: 23c1be8cee am: 8f127f41cb am: 1aa1ee7170 
Change-Id: I5edb4ac118ed53ec33c8388629bb158df2171d91
 2020-03-04 20:19:08 +00:00
Automerger Merge Worker
1aa1ee7170 hidl WVDrmPlugin openSession: set securityLevel correctly am: 9a530b7f1e am: 23c1be8cee am: 8f127f41cb 
Change-Id: I4136c508b2c4c9351ab5cf9f3ea9ae9ef4955926
 2020-03-04 20:03:10 +00:00
Automerger Merge Worker
8f127f41cb hidl WVDrmPlugin openSession: set securityLevel correctly am: 9a530b7f1e am: 23c1be8cee 
Change-Id: I30c8e0fd77385a4d14ef0c8483b2654792dcdbc1
 2020-03-04 19:48:01 +00:00
Automerger Merge Worker
23c1be8cee hidl WVDrmPlugin openSession: set securityLevel correctly am: 9a530b7f1e 
Change-Id: I7dbc26be06ae0fdfa0013dd65a57c169b21f4bdc
 2020-03-04 19:33:38 +00:00
Robert Shih
9a530b7f1e hidl WVDrmPlugin openSession: set securityLevel correctly 
Merge of http://go/wvgerrit/94827

Bug: 149035295
Bug: 150103154
Bug: 150407639
Test: VtsHalDrmV1_2TargetTest
Change-Id: I3687b2305eb413112f7fbd0d5127d2168cdf376d
 2020-03-04 18:44:44 +00:00
Automerger Merge Worker
b1e91eb78a [automerger skipped] Merge "Merge "CDM handles mixed output warnings." into rvc-dev am: d3f10ece7c am: cfb91676e9" into rvc-d1-dev-plus-aosp am: ea2124a286 -s ours am: 120ff74e3d -s ours 
am skip reason: Change-Id Iaf9da3f0c88889525f73f3153a5977c8416286bb with SHA-1 fb5c67929f is in history

Change-Id: Ia190afdb3140f4da1cc22d47c791acde58ae594b
 2020-03-02 19:32:04 +00:00
Automerger Merge Worker
51c3647384 [automerger skipped] Merge "CDM handles mixed output warnings." into rvc-dev am: d3f10ece7c am: cfb91676e9 am: b7408fbe9e -s ours am: 074c2b7f9c -s ours 
am skip reason: Change-Id Iaf9da3f0c88889525f73f3153a5977c8416286bb with SHA-1 fb5c67929f is in history

Change-Id: Ie2f966d18d1e64a8ec210b6c4516622c830d6a85
 2020-03-02 19:30:54 +00:00
Automerger Merge Worker
2320fc5f3d [automerger skipped] Merge "CDM handles mixed output warnings." into rvc-dev am: d3f10ece7c am: bbf7f28831 am: 09d4f2b535 am: b5b23ba16c -s ours 
am skip reason: Change-Id Iaf9da3f0c88889525f73f3153a5977c8416286bb with SHA-1 d9c703ef9e is in history

Change-Id: Ib20928c1ff9ccf3475a362df9bdc8d5b284f0901
 2020-03-02 19:29:26 +00:00
Automerger Merge Worker
120ff74e3d [automerger skipped] Merge "Merge "CDM handles mixed output warnings." into rvc-dev am: d3f10ece7c am: cfb91676e9" into rvc-d1-dev-plus-aosp am: ea2124a286 -s ours 
am skip reason: Change-Id Iaf9da3f0c88889525f73f3153a5977c8416286bb with SHA-1 fb5c67929f is in history

Change-Id: If96bace3b5af83e8fbe534682e29cb352da98b8c
 2020-03-02 19:12:52 +00:00
Automerger Merge Worker
074c2b7f9c [automerger skipped] Merge "CDM handles mixed output warnings." into rvc-dev am: d3f10ece7c am: cfb91676e9 am: b7408fbe9e -s ours 
am skip reason: Change-Id Iaf9da3f0c88889525f73f3153a5977c8416286bb with SHA-1 fb5c67929f is in history

Change-Id: I21c1e3c9e82d4de4cdeb599ba597bbad759218dd
 2020-03-02 19:12:23 +00:00
Automerger Merge Worker
b5b23ba16c Merge "CDM handles mixed output warnings." into rvc-dev am: d3f10ece7c am: bbf7f28831 am: 09d4f2b535 
Change-Id: I0ccd660b7b452443bc6afb67de53361f57866bc7
 2020-03-02 19:11:38 +00:00
Automerger Merge Worker
ea2124a286 Merge "Merge "CDM handles mixed output warnings." into rvc-dev am: d3f10ece7c am: cfb91676e9" into rvc-d1-dev-plus-aosp 2020-03-02 18:54:55 +00:00
Automerger Merge Worker
42cb23e6e9 Merge "CDM handles mixed output warnings." into rvc-dev am: d3f10ece7c am: cfb91676e9 
Change-Id: I634b830d2673ec385146cca388577b54ce60f68b
 2020-03-02 18:54:51 +00:00
Automerger Merge Worker
b7408fbe9e Merge "CDM handles mixed output warnings." into rvc-dev am: d3f10ece7c am: cfb91676e9 
Change-Id: If8e9bc95640e4bfa7ac9c4c03fd29f670d4c0639
 2020-03-02 18:54:48 +00:00
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
659e02f338 Merge "Use staging provisioning server even more" into rvc-dev am: b73c015557 am: fa58da183b am: 92422fe4f1 am: d25dc0c09e 
Change-Id: Iab7da20ff71bab79c31b23d27be33d3082c034ff
 2020-02-29 02:36:57 +00:00
Automerger Merge Worker
65ba378dbc Merge "Use staging provisioning server even more" into rvc-dev am: b73c015557 am: b604a114fa am: c80a6473d9 am: 7d128f56a4 
Change-Id: I362f2ed3a1cbd64fe4a8e44cf333dd44bc0128cd
 2020-02-29 02:36:44 +00:00
Automerger Merge Worker
4bcd5c169e Merge "Use staging provisioning server even more" into rvc-dev am: b73c015557 am: fa58da183b am: a035e72daf am: 9875b5a130 
Change-Id: I16f2224321a237394f9aff0b235bc8d6d1128a4a
 2020-02-29 02:36:29 +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
Automerger Merge Worker
5cfc13e50c Merge "Add odk_test to platform tests" into rvc-dev am: 5ebb430af7 am: 440b864da3 am: 645bd40a5a am: 72a766f338 
Change-Id: I0786573aed4a195dc5495b136fa6f076ef084892
 2020-02-28 03:27:17 +00:00
Automerger Merge Worker
06021f9475 Merge "Add odk_test to platform tests" into rvc-dev am: 5ebb430af7 am: 013fff3618 am: c2387ab507 am: b733e67adc 
Change-Id: Id475724cac288bdf52d35b36843558376a4c7f94
 2020-02-28 03:27:11 +00:00
Automerger Merge Worker
2b882a9c34 Merge "Add odk_test to platform tests" into rvc-dev am: 5ebb430af7 am: 440b864da3 am: 53ec720bfc am: bfce5afcce 
Change-Id: Ibed4f50a97b4d5efa17037eaf617525295638ecf
 2020-02-28 03:26:56 +00: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
23c342002e Merge "Search for test executables in odk_test" into rvc-dev am: 6373ff35ca am: c4804925ed am: 0e2adab96f am: 1e464933ec 
Change-Id: Ibd7bdb3a14a7cba77947644787a386cee81ad0dc
 2020-02-28 00:40:43 +00:00
Automerger Merge Worker
fdca300073 Merge "Search for test executables in odk_test" into rvc-dev am: 6373ff35ca am: 50a831a37e am: 0d9d17a748 am: 30f9881e05 
Change-Id: I447b6cfc89ea5e74ef48ee720fe5a1f9aefc28d7
 2020-02-28 00:40:37 +00:00
Automerger Merge Worker
99442f0aa8 Merge "Search for test executables in odk_test" into rvc-dev am: 6373ff35ca am: c4804925ed am: 97698623e6 am: d8454fdc54 
Change-Id: I8eaaf6690d0aec26b5a59eb6737120eb75a2c156
 2020-02-28 00:40:31 +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