Commit Graph

1908 Commits

Author SHA1 Message Date
Rahul Frias
9f4a7480aa Merge \\\"Upgrade TLS version in integration tests\\\" into nyc-dev am: 1ebaf6ad82 am: eeb6606784
am: dcf60776bd

Change-Id: Ib87a3ea4bf729ead513be2060f8842c1ec694c13
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

Change-Id: I6f18b5707716795b02ae971d101110a651e937e9
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

Change-Id: I701cc75fda74a09c84a85a00395b2c875908ad5c
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

Change-Id: I19d7dc49c9bd696031eb1832435a8bd63a8ffff0
2016-06-20 20:05:43 +00:00
Rahul Frias
eeb6606784 Merge \"Upgrade TLS version in integration tests\" into nyc-dev
am: 1ebaf6ad82

Change-Id: I87127e320f65c48c95496815a634c6ad854af58a
2016-06-20 20:02:53 +00:00
Rahul Frias
6cd9b50064 Merge \"Upgrade TLS version in integration tests\" into nyc-dev
am: 1ebaf6ad82

Change-Id: Ibcfe029d50fefeb6e00ca6b5ac2d704838a51604
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

Change-Id: I278ffa43430835294c6b379eda518297c20bf0de
2016-06-18 02:15:46 +00:00
Jeff Tinker
a0fcdbc8f0 Merge \\"Rework WidevineSamplePlayer to use fragments\\" into nyc-dev am: 02d8671882
am: 9b8c6286b6

Change-Id: I0427fe538ffcb3f70f012662cf41c2303d80efbb
2016-06-18 02:04:09 +00:00
Jeff Tinker
9b8c6286b6 Merge \"Rework WidevineSamplePlayer to use fragments\" into nyc-dev
am: 02d8671882

Change-Id: I5846eabc3774e616d4334e5f03080ca9e6ed6aaa
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

Change-Id: Ie5c49fef6b19331adb23c85c8cd814b08d0e5141
2016-06-17 21:43:00 +00:00
Jeff Tinker
98d0e9b614 Merge \"Rework WidevineSamplePlayer to use fragments\" into nyc-dev
am: 02d8671882

Change-Id: I8b2d18fb234b697712c33f51fa3be8b45b0f1e19
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

Change-Id: I93f91669aa57ad92f6be5758f0361408b4557446
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

Change-Id: I50789f65050411de888c43cd8b45df4532b6c596
2016-06-17 19:54:04 +00:00
Jeff Tinker
6ee3b062b2 Update the expected android build version for NYC release am: 2bd6131162
am: cb9fc66a34

Change-Id: I142852d904617207e79d56af0b144a82352f9a6c
2016-06-17 18:28:57 +00:00
Jeff Tinker
cb9fc66a34 Update the expected android build version for NYC release
am: 2bd6131162

Change-Id: I27f76c54e3192151ad6d4857dd9ed59bf265760d
2016-06-17 18:25:51 +00:00
Jeff Tinker
4818bca635 Update the expected android build version for NYC release am: 2bd6131162
am: 3c5ca90637

Change-Id: I425a01afdee4d9cfeb74d0e2f5b9025326a133d0
2016-06-17 18:23:25 +00:00
Jeff Tinker
3c5ca90637 Update the expected android build version for NYC release
am: 2bd6131162

Change-Id: Ia5006b4f1c54896dfb3c0753d6139dc10f20c208
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

* commit 'a914f6d31f6bc15be56ea745f5632bcb8425d20a':

Change-Id: Iacfe7fecdfe71d497eeb39e20dbe5db7b0e32120
2016-05-24 00:55:13 +00:00
Rahul Frias
f3226af44a Report OEMCrypto security patch level am: e33895f5de am: 1f7aa66d54
am: bdbd5c2d55

* commit 'bdbd5c2d55c9065ebe18e6a0385fb5f309ebd7eb':
  Report OEMCrypto security patch level

Change-Id: Iada6d2e029561b1399f6cd31421fd97a85b6e6e0
2016-05-24 00:55:12 +00:00
Rahul Frias
a914f6d31f Report OEMCrypto security patch level am: e33895f5de
am: ce5475169b

* commit 'ce5475169beb3e8b6c997f6bcbdb2c423c815a0c':

Change-Id: I2a320cb952f0e0c953c6e98f7811b0ea0c5f8b4d
2016-05-24 00:47:14 +00:00
Rahul Frias
bdbd5c2d55 Report OEMCrypto security patch level am: e33895f5de
am: 1f7aa66d54

* commit '1f7aa66d54272825dc70055154d10c5b46f1daf1':
  Report OEMCrypto security patch level

Change-Id: Icb84ff94201b4dce5aac24ffe22a6ed766352cc2
2016-05-24 00:47:03 +00:00
Rahul Frias
ce5475169b Report OEMCrypto security patch level
am: e33895f5de

* commit 'e33895f5deccdbb15d3ba028190e07864f326ab2':
  Report OEMCrypto security patch level

Change-Id: Ica7691a9001b29adb55e173ce2876e5a955a0415
2016-05-24 00:38:59 +00:00
Rahul Frias
1f7aa66d54 Report OEMCrypto security patch level
am: e33895f5de

* commit 'e33895f5deccdbb15d3ba028190e07864f326ab2':
  Report OEMCrypto security patch level

Change-Id: I377b697ebae8beee5679d71cf9233e15d95d65c3
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

* commit '9c0a4890e00eeb397ee4ae06edbaa0ad39dc69e0':

Change-Id: I26b96f442d486d5c77a2e7a20436a8794752ecbe
2016-05-20 00:27:43 +00:00
Fred Gylys-Colwell
eb0fbee336 Remove pattern offset tests am: 0b2223018d am: b65344398c
am: eb575aabd4

* commit 'eb575aabd4d9d8e3354bd5202aff8da8675a4770':
  Remove pattern offset tests

Change-Id: I0f242dd727bea454089ad1ff288c05cccd66acab
2016-05-20 00:27:42 +00:00
Fred Gylys-Colwell
9c0a4890e0 Remove pattern offset tests am: 0b2223018d
am: 6db197210f

* commit '6db197210f9e654f0512db5a14d2f0b60bec4e33':

Change-Id: I64f81d86dbfbd68505424f5227f3e3a6dbc67ae2
2016-05-19 21:56:11 +00:00
Fred Gylys-Colwell
eb575aabd4 Remove pattern offset tests am: 0b2223018d
am: b65344398c

* commit 'b65344398c599d855ac3e518da1c97426ea708e3':
  Remove pattern offset tests

Change-Id: I3715459882fb2146c8f5ecc410f60e72489c937a
2016-05-19 21:55:33 +00:00
Fred Gylys-Colwell
6db197210f Remove pattern offset tests
am: 0b2223018d

* commit '0b2223018dd2901e1d5e68d2a5f238bba9ba79ed':
  Remove pattern offset tests

Change-Id: I2e94ef907230119f1e728942a5b8b8537c836e3f
2016-05-19 21:53:34 +00:00
Fred Gylys-Colwell
b65344398c Remove pattern offset tests
am: 0b2223018d

* commit '0b2223018dd2901e1d5e68d2a5f238bba9ba79ed':
  Remove pattern offset tests

Change-Id: I1a9709a7dd092d13508fca20f871ab71a43a5af1
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

* commit 'e98708b4db3b61ab337825de95f7352ff1714147':

Change-Id: I7a21858565cd3cee4cdf26ca380187868602d13c
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

* commit 'd88ed151aa3c78b62a83d53908199bd8f59eb852':
  Push android unit tests to /data

Change-Id: I2c2f85ac2e22f474519d3a49db52763191a19d7a
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

* commit '5a16e85da519bcdf4904af64bb82c7ca59cda5cc':
  Push android unit tests to /data

Change-Id: I1f00e459e3ee4167cee0b46f6c822c1a9958b697
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

* commit 'bba11c61a23b6a1490e5581d32520246e3995a17':
  Push android unit tests to /data

Change-Id: I1c97f75d37cc3fb0b0f73dd46fa62861846cb67a
2016-05-03 15:53:49 +00:00
Fred Gylys-Colwell
bba11c61a2 Merge "Push android unit tests to /data" into nyc-dev
am: 1f204c5cfa

* commit '1f204c5cfa1bf3aee53e9f284a92031c47c31cbd':
  Push android unit tests to /data

Change-Id: I5f537c2741a4504f9c111809bf94457d015e1fc1
2016-05-03 15:51:32 +00:00
Fred Gylys-Colwell
5a16e85da5 Merge "Push android unit tests to /data" into nyc-dev
am: 1f204c5cfa

* commit '1f204c5cfa1bf3aee53e9f284a92031c47c31cbd':
  Push android unit tests to /data

Change-Id: Idc020cf557649469bc4b4ddc66963c47211613ea
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
Fred Gylys-Colwell
a4ebdf80b5 Push android unit tests to /data
Merge of http://go/wvgerrit/17652

This CL changes the android/build_and_run_all_unit_tests.sh script to
push exectuables to /data if it can't push to /system/bin.

The script run_all_unit_tests.sh will check if test files are in /data
and run those first, if not, it runs the files in /system/bin.

This change is needed to test unit tests on devices where /system/bin
is a read only file system, even after running "adb remount".

This CL will help verify, but will not fix
b/27678092

Change-Id: Ia0fe8c2e68722f58c2626f22113abdbdc8c5e408
2016-05-02 15:16:14 -07:00