Rahul Frias
4a9c2fa2a1
Merge "Do not convert the protection scheme to network byte order" into nyc-mr1-dev am: 4b8b1e0e98 am: 2b6f90c631
...
am: 8316c02ba2
2016-08-23 23:20:07 +00:00
Rahul Frias
2ec84f7338
Do not convert the protection scheme to network byte order am: 6a206191f0 am: fa55cf181b
...
am: 1ca2348287
2016-08-23 23:20:07 +00:00
John "Juce" Bruce
15ca8148a8
Widevine Version Number for NYC-MR1
...
(This is a merge of go/wvgerrit/20402)
This updates the version number to v4.1.0 for the NYC-MR1 release. It
also updates the canary to pass on the nyc-mr1-dev branch.
Bug: 30813903
Change-Id: I05de038ff52e9f7633efff7011052b48b59d90fa
2016-08-23 15:34:39 -07:00
Rahul Frias
8316c02ba2
Merge "Do not convert the protection scheme to network byte order" into nyc-mr1-dev am: 4b8b1e0e98
...
am: 2b6f90c631
2016-08-23 22:11:38 +00:00
Rahul Frias
1ca2348287
Do not convert the protection scheme to network byte order am: 6a206191f0
...
am: fa55cf181b
2016-08-23 22:11:37 +00:00
Rahul Frias
2b6f90c631
Merge "Do not convert the protection scheme to network byte order" into nyc-mr1-dev
...
am: 4b8b1e0e98
2016-08-23 22:06:56 +00:00
Rahul Frias
fa55cf181b
Do not convert the protection scheme to network byte order
...
am: 6a206191f0
2016-08-23 22:06:55 +00:00
Rahul Frias
4b8b1e0e98
Merge "Do not convert the protection scheme to network byte order" into nyc-mr1-dev
2016-08-23 21:55:11 +00:00
Rahul Frias
6a206191f0
Do not convert the protection scheme to network byte order
...
[ Merge of http://go/wvgerrit/19960 ]
Protections schemes are specified using a 4CC code {"cbc1", "cbcs",
"cenc", "cens"}. A host to network conversion was performed when the
PSSH was created and inserted into the license request. A reverse
conversion was performed when the code was extracted from the
license response.
These conversions are problematic if the PSSH is created externally and
passed into mediaDrm. To address this, the conversions have been removed
and allow protobuf to handle byte ordering. For backward compatibility
we allow codes in either ordering.
b/30713238
Change-Id: I25f01ecc621549fd3c13b443e4c8b89168463249
2016-08-23 12:51:12 -07:00
Rahul Frias
70c98c51e1
Do not convert the protection scheme to network byte order [DO NOT MERGE ANYWHERE] am: 13a4fe8e4c -s ours am: ae61d10476 -s ours am: 9ed5a46808 -s ours am: 65fe794386 -s ours
...
am: 9139a68d2b
2016-08-22 23:02:59 +00:00
Rahul Frias
9139a68d2b
Do not convert the protection scheme to network byte order [DO NOT MERGE ANYWHERE] am: 13a4fe8e4c -s ours am: ae61d10476 -s ours am: 9ed5a46808 -s ours
...
am: 65fe794386
2016-08-22 22:58:37 +00:00
TreeHugger Robot
10f7e17522
Merge "Stop hard coding gtest paths."
2016-08-22 22:57:08 +00:00
Rahul Frias
65fe794386
Do not convert the protection scheme to network byte order [DO NOT MERGE ANYWHERE] am: 13a4fe8e4c -s ours am: ae61d10476 -s ours
...
am: 9ed5a46808
2016-08-22 22:54:13 +00:00
Rahul Frias
9ed5a46808
Do not convert the protection scheme to network byte order [DO NOT MERGE ANYWHERE] am: 13a4fe8e4c -s ours
...
am: ae61d10476
2016-08-22 22:06:40 +00:00
Rahul Frias
8f65d1dd90
Do not convert the protection scheme to network byte order [DO NOT MERGE ANYWHERE] am: 13a4fe8e4c -s ours am: e5865ae3bc -s ours
...
am: 0a4e27fd16
2016-08-22 21:58:59 +00:00
Rahul Frias
0a4e27fd16
Do not convert the protection scheme to network byte order [DO NOT MERGE ANYWHERE] am: 13a4fe8e4c -s ours
...
am: e5865ae3bc
2016-08-22 21:54:25 +00:00
Rahul Frias
e5865ae3bc
Do not convert the protection scheme to network byte order [DO NOT MERGE ANYWHERE]
...
am: 13a4fe8e4c
2016-08-22 21:50:02 +00:00
Rahul Frias
ae61d10476
Do not convert the protection scheme to network byte order [DO NOT MERGE ANYWHERE]
...
am: 13a4fe8e4c
2016-08-22 21:46:02 +00:00
Dan Albert
eadd3689a2
Stop hard coding gtest paths.
...
These are automatically exported by libgtest.
Change-Id: Ia55222989523ecda7a4a686ef794040515f56224
Test: mma
Bug: None
2016-08-22 13:53:20 -07:00
Rahul Frias
13a4fe8e4c
Do not convert the protection scheme to network byte order [DO NOT MERGE ANYWHERE]
...
[ Merge of http://go/wvgerrit/19901 ]
Protections schemes are specified using a 4CC code {"cbc1", "cbcs",
"cenc", "cens"}. A host to network conversion was performed when the
PSSH was created and inserted into the license request. A reverse
conversion was performed when the code was extracted from the
license response.
These conversions are problematic if the PSSH is created externally and
passed into mediaDrm. To address this, the conversions have been removed
and allow protobuf to handle byte ordering. For backward compatibility
we allow codes in either ordering.
b/30713238
Change-Id: I721b375e446526e544856759cada76a1fa6c7be5
2016-08-22 20:49:24 +00:00
Dan Albert
7ef26a32b3
Stop hard coding gtest things.
...
The headers are exported.
Change-Id: If095898ca8d9dfd2a807dcc35bc197e76963fff4
Test: mma
2016-08-17 12:30:17 -07:00
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
