Jeff Tinker
5747f51a98
Annotate CDM error enums with their values
...
This makes it easier to translate an error code
number to the corresponding enum.
Merge of https://widevine-internal-review.googlesource.com/18793/
from the widevine repo.
Change-Id: I7d07f16e5477decd27fcc5391fc62b1bd254d4a3
2016-08-02 20:56:16 +00:00
Rahul Frias
9f4a7480aa
Merge \\\"Upgrade TLS version in integration tests\\\" into nyc-dev am: 1ebaf6ad82 am: eeb6606784
...
am: dcf60776bd
2016-06-20 20:13:38 +00:00
Rahul Frias
f99c890116
Merge \\\"Upgrade TLS version in integration tests\\\" into nyc-dev am: 1ebaf6ad82 am: 6cd9b50064
...
am: 88a9525513
2016-06-20 20:13:38 +00:00
Rahul Frias
dcf60776bd
Merge \\"Upgrade TLS version in integration tests\\" into nyc-dev am: 1ebaf6ad82
...
am: eeb6606784
2016-06-20 20:06:46 +00:00
Rahul Frias
88a9525513
Merge \\"Upgrade TLS version in integration tests\\" into nyc-dev am: 1ebaf6ad82
...
am: 6cd9b50064
2016-06-20 20:05:43 +00:00
Rahul Frias
eeb6606784
Merge \"Upgrade TLS version in integration tests\" into nyc-dev
...
am: 1ebaf6ad82
2016-06-20 20:02:53 +00:00
Rahul Frias
6cd9b50064
Merge \"Upgrade TLS version in integration tests\" into nyc-dev
...
am: 1ebaf6ad82
2016-06-20 20:02:42 +00:00
Rahul Frias
1ebaf6ad82
Merge "Upgrade TLS version in integration tests" into nyc-dev
2016-06-20 19:55:27 +00:00
Rahul Frias
b552a133c2
Upgrade TLS version in integration tests
...
[ Merge of http://go/wvgerrit/18295 ]
SSL v3 is being disabled across Google infrastructure. Networking
code in integration tests used SSL v3 during HTTPS protocol negotiation.
Once this is disabled, it will cause integration test failures at
staging and UAT license servers.
With this change the client will use TLS 1.2. Insecure cipher suites
(TLS_RSA_WITH_RC4_128_MD5, TLS_RSA_WITH_RC4_128_SHA,
TLS_ECDHE_ECDSA_WITH_RC4_128_SHA, TLS_ECDHE_RSA_WITH_RC4_128_SHA)
have been disabled as well.
b/29356581
Change-Id: I98a04d345fe83c48132b9d79986a21cc84827dc8
2016-06-17 22:28:56 -07:00
Jeff Tinker
3addd861e4
Merge \\\"Rework WidevineSamplePlayer to use fragments\\\" into nyc-dev am: 02d8671882 am: 9b8c6286b6
...
am: a0fcdbc8f0
2016-06-18 02:15:46 +00:00
Jeff Tinker
a0fcdbc8f0
Merge \\"Rework WidevineSamplePlayer to use fragments\\" into nyc-dev am: 02d8671882
...
am: 9b8c6286b6
2016-06-18 02:04:09 +00:00
Jeff Tinker
9b8c6286b6
Merge \"Rework WidevineSamplePlayer to use fragments\" into nyc-dev
...
am: 02d8671882
2016-06-18 02:01:31 +00:00
Jeff Tinker
0b67ef624b
Fix build break
...
Change-Id: I7525575a9de78a60cc87e29c512dc35ee6a4a29c
2016-06-17 18:54:26 -07:00
Jeff Tinker
267803d2c5
resolve merge conflicts of 907e26c to master
...
Change-Id: I9dc9f6943192fe2d39d87f0405953b63794123bc
2016-06-17 15:36:23 -07:00
Jeff Tinker
907e26c842
Merge \\"Rework WidevineSamplePlayer to use fragments\\" into nyc-dev am: 02d8671882
...
am: 98d0e9b614
2016-06-17 21:43:00 +00:00
Jeff Tinker
98d0e9b614
Merge \"Rework WidevineSamplePlayer to use fragments\" into nyc-dev
...
am: 02d8671882
2016-06-17 21:37:47 +00:00
Jeff Tinker
02d8671882
Merge "Rework WidevineSamplePlayer to use fragments" into nyc-dev
2016-06-17 21:24:47 +00:00
Jeff Tinker
b77b6569e5
Update the expected android build version for NYC release am: 2bd6131162 am: cb9fc66a34
...
am: 6ee3b062b2
2016-06-17 19:54:04 +00:00
Jeff Tinker
e046b3283b
Update the expected android build version for NYC release am: 2bd6131162 am: 3c5ca90637
...
am: 4818bca635
2016-06-17 19:54:04 +00:00
Jeff Tinker
6ee3b062b2
Update the expected android build version for NYC release am: 2bd6131162
...
am: cb9fc66a34
2016-06-17 18:28:57 +00:00
Jeff Tinker
cb9fc66a34
Update the expected android build version for NYC release
...
am: 2bd6131162
2016-06-17 18:25:51 +00:00
Jeff Tinker
4818bca635
Update the expected android build version for NYC release am: 2bd6131162
...
am: 3c5ca90637
2016-06-17 18:23:25 +00:00
Jeff Tinker
3c5ca90637
Update the expected android build version for NYC release
...
am: 2bd6131162
2016-06-17 18:19:57 +00:00
Jeff Tinker
2bd6131162
Update the expected android build version for NYC release
...
bug: 29270537
Change-Id: I2f85dd95e1a2b9eaa79299441b48716599211eea
2016-06-17 00:39:33 +00:00
Jeff Tinker
9f735d298a
Rework WidevineSamplePlayer to use fragments
...
Previously it used TabActivity which has been deprecated
and no longer works.
bug: 29045104
Change-Id: I207f0208b6dba47adfa0ffe7485800d1561af617
2016-06-13 11:27:03 -07:00
Edwin Wong
c4920addea
Merge "Fix FATAL EXCEPTION when Widevine Classic libraries are not found on device."
2016-06-01 21:39:48 +00:00
Edwin Wong
afd3d7928f
Fix FATAL EXCEPTION when Widevine Classic libraries are not found on device.
...
On device that does not support Widevince Classic playback, display
a Toast pop up to inform users. This prevents a FATAL EXCEPTION from
occuring when acquireDrmInfo() returns a null response in the absence
of Widevine Classic libs.
To test this mode, rename libwvdrm_L?.so in system/vendor/lib and reboot.
bug: 28964035
Change-Id: Ib47d4b3419a6395d402c1b78f3cdc8472b0d6946
2016-06-01 13:09:51 -07:00
Jeff Tinker
6219322a1e
Fix the order of test case name and test name
...
In the unit tests, the test case name and test name
are logged, but currently the test case and name are
reversed. This CL orders them correctly, so instead
of, e.g. CheckHDCPCapability.OEMCryptoClientTest, we
get OEMCryptoClientTest.CheckHDCPCapability as intended.
Merge of go/wvgerrit/18045 from widevine repo
Change-Id: I20bb2d47de0c84b3a1f00bb46af5ed0a45d7fc56
2016-06-01 19:07:19 +00:00
Rahul Frias
b21a992969
Report OEMCrypto security patch level am: e33895f5de am: ce5475169b
...
am: a914f6d31f
2016-05-24 00:55:13 +00:00
Rahul Frias
f3226af44a
Report OEMCrypto security patch level am: e33895f5de am: 1f7aa66d54
...
am: bdbd5c2d55
2016-05-24 00:55:12 +00:00
Rahul Frias
a914f6d31f
Report OEMCrypto security patch level am: e33895f5de
...
am: ce5475169b
2016-05-24 00:47:14 +00:00
Rahul Frias
bdbd5c2d55
Report OEMCrypto security patch level am: e33895f5de
...
am: 1f7aa66d54
2016-05-24 00:47:03 +00:00
Rahul Frias
ce5475169b
Report OEMCrypto security patch level
...
am: e33895f5de
2016-05-24 00:38:59 +00:00
Rahul Frias
1f7aa66d54
Report OEMCrypto security patch level
...
am: e33895f5de
2016-05-24 00:38:59 +00:00
Rahul Frias
e33895f5de
Report OEMCrypto security patch level
...
[ Merge of http://go/wvgerrit/17959 ]
This will allow the license server to base licensing decisions on the
devices security module revision.
b/28882058
Change-Id: I574e7686bb305397946d2bfaff504cfae242e628
2016-05-23 10:50:07 -07:00
Fred Gylys-Colwell
f506faa134
Remove pattern offset tests am: 0b2223018d am: 6db197210f
...
am: 9c0a4890e0
2016-05-20 00:27:43 +00:00
Fred Gylys-Colwell
eb0fbee336
Remove pattern offset tests am: 0b2223018d am: b65344398c
...
am: eb575aabd4
2016-05-20 00:27:42 +00:00
Fred Gylys-Colwell
9c0a4890e0
Remove pattern offset tests am: 0b2223018d
...
am: 6db197210f
2016-05-19 21:56:11 +00:00
Fred Gylys-Colwell
eb575aabd4
Remove pattern offset tests am: 0b2223018d
...
am: b65344398c
2016-05-19 21:55:33 +00:00
Fred Gylys-Colwell
6db197210f
Remove pattern offset tests
...
am: 0b2223018d
2016-05-19 21:53:34 +00:00
Fred Gylys-Colwell
b65344398c
Remove pattern offset tests
...
am: 0b2223018d
2016-05-19 21:53:04 +00:00
Fred Gylys-Colwell
0b2223018d
Remove pattern offset tests
...
Merge from widevine repo of http://go/wvgerrit/17877
The final spec for CENC says that partial encrypted blocks are only
allowed for "cenc" mode, and not for "cens" mode. Also, the
pattern_offset must be 0 for all calls to OEMCrypto_DecryptCENC.
Review doc changes http://go/wvdelta11 and http://go/oemcrypto
Notice that this CL affects documentation and test code only. No
production code is affected.
b/28718266
b/28817376
Change-Id: I1d6a38a763a2b693ea0c26bc909e1c721b8facaf
2016-05-17 15:15:18 -07:00
Fred Gylys-Colwell
141efce83d
Merge "Merge "Push android unit tests to /data" into nyc-dev am: 1f204c5cfa am: bba11c61a2" into nyc-mr1-dev-plus-aosp
...
am: e98708b4db
2016-05-03 15:56:31 +00:00
Fred Gylys-Colwell
1bb7826005
Merge "Push android unit tests to /data" into nyc-dev am: 1f204c5cfa am: 5a16e85da5
...
am: d88ed151aa
2016-05-03 15:56:31 +00:00
Android Build Merger (Role)
e98708b4db
Merge "Merge "Push android unit tests to /data" into nyc-dev am: 1f204c5cfa am: bba11c61a2" into nyc-mr1-dev-plus-aosp
2016-05-03 15:54:02 +00:00
Fred Gylys-Colwell
d88ed151aa
Merge "Push android unit tests to /data" into nyc-dev am: 1f204c5cfa
...
am: 5a16e85da5
2016-05-03 15:53:49 +00:00
Fred Gylys-Colwell
de23d0d41a
Merge "Push android unit tests to /data" into nyc-dev am: 1f204c5cfa
...
am: bba11c61a2
2016-05-03 15:53:49 +00:00
Fred Gylys-Colwell
bba11c61a2
Merge "Push android unit tests to /data" into nyc-dev
...
am: 1f204c5cfa
2016-05-03 15:51:32 +00:00
Fred Gylys-Colwell
5a16e85da5
Merge "Push android unit tests to /data" into nyc-dev
...
am: 1f204c5cfa
2016-05-03 15:51:32 +00:00
Fred Gylys-Colwell
1f204c5cfa
Merge "Push android unit tests to /data" into nyc-dev
2016-05-03 15:48:04 +00:00
