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

3486 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
d4157db16d Merge "Correct log messages" into rvc-dev am: d0d3216eda am: b093ce8733 am: 69f1ab03c7 am: d23eaff1ab 
Change-Id: Ifd41e96ed4e725617affd1580a4a9cb5dac65a09
 2020-03-05 00:50:11 +00:00
Automerger Merge Worker
646ae17d0c Merge "Correct log messages" into rvc-dev am: d0d3216eda am: ec2d331246 am: 5e9ab5aa83 am: 3eeab6d48d 
Change-Id: I5d1f46fc4142df0aa80baba4981682763656bc96
 2020-03-05 00:49:45 +00:00
Automerger Merge Worker
d23eaff1ab Merge "Correct log messages" into rvc-dev am: d0d3216eda am: b093ce8733 am: 69f1ab03c7 
Change-Id: I84e231b9a79a5a6dc8a8753bca41429a7dae4484
 2020-03-05 00:37:20 +00:00
Automerger Merge Worker
3eeab6d48d Merge "Correct log messages" into rvc-dev am: d0d3216eda am: ec2d331246 am: 5e9ab5aa83 
Change-Id: I779aab44b25c88068eaa62d197c44df4a9157792
 2020-03-05 00:36:54 +00:00
Automerger Merge Worker
69f1ab03c7 Merge "Correct log messages" into rvc-dev am: d0d3216eda am: b093ce8733 
Change-Id: Id0daa39e50810e2551d36737551c1187b4f3edbb
 2020-03-05 00:27:12 +00:00
Automerger Merge Worker
5e9ab5aa83 Merge "Correct log messages" into rvc-dev am: d0d3216eda am: ec2d331246 
Change-Id: I8ca840929b60296832a6da443fb79dc91e332778
 2020-03-05 00:26:55 +00:00
Automerger Merge Worker
b093ce8733 Merge "Correct log messages" into rvc-dev am: d0d3216eda 
Change-Id: I7fb8dcd64b45f872e3cf840ef59aaddeabb63163
 2020-03-05 00:11:02 +00:00
Automerger Merge Worker
ec2d331246 Merge "Correct log messages" into rvc-dev am: d0d3216eda 
Change-Id: Ib9d57ae301d678b6d2c1ec879aa6b4374ddc9e40
 2020-03-05 00:11:01 +00:00
Rahul Frias
d0d3216eda Merge "Correct log messages" into rvc-dev 2020-03-05 00:01:37 +00:00
Automerger Merge Worker
f69707c556 hidl WVDrmPlugin openSession: set securityLevel correctly am: 9a530b7f1e am: 23c1be8cee am: 8f127f41cb am: 6e14debce3 am: 53babd374a am: b7f75f3959 
Change-Id: I6e258f697dbbd1763a47fa58016442c48e95d9ef
 2020-03-04 20:37:24 +00:00
Automerger Merge Worker
d2a8605fe1 hidl WVDrmPlugin openSession: set securityLevel correctly am: 9a530b7f1e am: 23c1be8cee am: 6e18484a49 am: a03a713af2 am: 9e25ff264e 
Change-Id: I5dbd33dcde058addb900abe0612775121a3d9bfa
 2020-03-04 20:36:40 +00:00
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
b7f75f3959 hidl WVDrmPlugin openSession: set securityLevel correctly am: 9a530b7f1e am: 23c1be8cee am: 8f127f41cb am: 6e14debce3 am: 53babd374a 
Change-Id: I520ad81d23edf93ecc580c509ede3f0eedcb7311
 2020-03-04 20:34:31 +00:00
Automerger Merge Worker
9e25ff264e hidl WVDrmPlugin openSession: set securityLevel correctly am: 9a530b7f1e am: 23c1be8cee am: 6e18484a49 am: a03a713af2 
Change-Id: Ifdca8bb5858857a7cee8c492eaf3950d20cfd666
 2020-03-04 20:19:31 +00:00
Automerger Merge Worker
53babd374a hidl WVDrmPlugin openSession: set securityLevel correctly am: 9a530b7f1e am: 23c1be8cee am: 8f127f41cb am: 6e14debce3 
Change-Id: Icd6995d494e2a8338b572e687104e1611265f0d1
 2020-03-04 20:19:29 +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
a03a713af2 hidl WVDrmPlugin openSession: set securityLevel correctly am: 9a530b7f1e am: 23c1be8cee am: 6e18484a49 
Change-Id: I0162b1f8a62427ace6a52ccbef267624e56fea14
 2020-03-04 20:03:22 +00:00
Automerger Merge Worker
6e14debce3 hidl WVDrmPlugin openSession: set securityLevel correctly am: 9a530b7f1e am: 23c1be8cee am: 8f127f41cb 
Change-Id: Id1e03bc728fb4f119d101e32c3e372136bf66a92
 2020-03-04 20:03:17 +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
6e18484a49 hidl WVDrmPlugin openSession: set securityLevel correctly am: 9a530b7f1e am: 23c1be8cee 
Change-Id: I0ea9b79244b92ab9afd6a963c2753e47c406529a
 2020-03-04 19:48:20 +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