Commit Graph

2610 Commits

Author SHA1 Message Date
Adam Stone
466ec4e632 Create two new metric types to simplify metrics.
This is part one of a mult-part change to revise some metrics. Several
metrics are currently EventMetric type when they should be a simpler
type.

Test: Added unit tests for the new types. Also, re-ran existing tests.
Verified playback works with Google Play, and re-ran Widevine GTS tests.

Bug: 36220619
Change-Id: I2ec8fc355f66ad4834dd722aacd22541fb9c94ad
2017-08-24 12:19:17 -07:00
Fred Gylys-Colwell
ad712dc7ad Create new usage header if old one corrupted am: 481a1effcb
am: 26a1175ec4

Change-Id: Id14456733047eb4ff406bc37c629dd6b7f4b3547
2017-08-19 00:55:47 +00:00
Fred Gylys-Colwell
26a1175ec4 Create new usage header if old one corrupted
am: 481a1effcb

Change-Id: I5221468430423c348736356984663fcb8013e9dd
2017-08-19 00:54:17 +00:00
Fred Gylys-Colwell
481a1effcb Create new usage header if old one corrupted
Merge of http://go/wvgerrit/31561

If the usage table header is corrupted, or if it is stale, then the
CDM should create a new one.

bug: 64572642

Testing: pushed stale usage table to Fugu, and netflix recovered
gracefully.  New unit test UsageTableHeaderTest.StaleHeader.

Change-Id: Ic66854ff6b0b252a0f4ca20e09f27852a50d6fcc
2017-08-18 15:09:18 -07:00
John W. Bruce
4c46d09e18 Update Widevine Android Version Number to 5.1.0 am: ce9c5f35ac
am: 55af4ec7bb

Change-Id: Ia6d6567b5db38f77f74641eeb26996c78a353676
2017-08-18 18:11:29 +00:00
John W. Bruce
55af4ec7bb Update Widevine Android Version Number to 5.1.0
am: ce9c5f35ac

Change-Id: I165beb5d5124596f9e04cd3e0f50d255e5d64388
2017-08-18 18:00:12 +00:00
John W. Bruce
ce9c5f35ac Update Widevine Android Version Number to 5.1.0
(This is a merge from http://go/wvgerrit/31360)

This also updates the version number change canary.

Bug: 64209738
Test: request_license_test
Change-Id: Ibdf27256822a32988a848ef5bf79bf2e2633fd59
2017-08-17 02:42:54 -07:00
Fred Gylys-Colwell
9e28656fa9 Move Watchdog Timer to L3 Init Only am: 1438873443 -s ours am: 6e8f889795 -s ours
am: 66ca265915  -s ours

Change-Id: I4f99bf318e77ea999ed3f1a91e09c3a16842f3f3
2017-08-11 04:30:30 +00:00
Fred Gylys-Colwell
c932faa000 Move Watchdog Timer to L3 Init Only am: 1438873443 am: e2173a86ff -s ours
am: 87cda53b9a  -s ours

Change-Id: I433af5fee970d27d80c9dd4166ab15173e768404
2017-08-11 04:30:18 +00:00
Fred Gylys-Colwell
66ca265915 Move Watchdog Timer to L3 Init Only am: 1438873443 -s ours
am: 6e8f889795  -s ours

Change-Id: I09426af7d950ad1c8e51afa375280ed7209adc10
2017-08-11 04:12:42 +00:00
Fred Gylys-Colwell
87cda53b9a Move Watchdog Timer to L3 Init Only am: 1438873443
am: e2173a86ff  -s ours

Change-Id: I382dd4e5b4b1e0f0aa44c201081ec5573afded17
2017-08-11 04:12:14 +00:00
Fred Gylys-Colwell
6e8f889795 Move Watchdog Timer to L3 Init Only
am: 1438873443  -s ours

Change-Id: I7c2e49318fd820af3a46a9ed792aa0e3c8725568
2017-08-11 04:08:43 +00:00
Fred Gylys-Colwell
e2173a86ff Move Watchdog Timer to L3 Init Only
am: 1438873443

Change-Id: I424b5606f1b0fd4bd5cdee45085c6843a65818ee
2017-08-11 04:08:43 +00:00
Fred Gylys-Colwell
4026d47de0 Merge "Move Watchdog Timer to L3 Init Only" into oc-mr1-dev am: 07edf821c4
am: e5d96b9950

Change-Id: Id6cd7669c8da4729b263c11055c64bd97eb2e7e6
2017-08-11 01:49:30 +00:00
Fred Gylys-Colwell
e5d96b9950 Merge "Move Watchdog Timer to L3 Init Only" into oc-mr1-dev
am: 07edf821c4

Change-Id: I35cdd77ad3fcd19e5f61a53b5ee8c615ad49973d
2017-08-11 01:45:40 +00:00
TreeHugger Robot
07edf821c4 Merge "Move Watchdog Timer to L3 Init Only" into oc-mr1-dev 2017-08-11 01:27:51 +00:00
Fred Gylys-Colwell
5bb2e55318 Move Watchdog Timer to L3 Init Only
Merge from Widevine repo of http://go/wvgerrit/31340

This CL moves the oemcrypto watchdog timer so that it only watches the
L3 initialization.  This will allow L1 initialization to take more
than 5 seconds if it needs to.

TEST: oemcrypto unit tests, Media GTS tests, Play Movies
b/64069544

Change-Id: I7826e4d72eda52ae8b2c9f8b3ac360fb42cbb115
2017-08-11 01:24:32 +00:00
Fred Gylys-Colwell
1438873443 Move Watchdog Timer to L3 Init Only
Merge from Widevine repo of http://go/wvgerrit/31302

This CL moves the oemcrypto watchdog timer so that it only watches the
L3 initialization.  This will allow L1 initialization to take more
than 5 seconds if it needs to.

TEST: oemcrypto unit tests, Media GTS tests, Play Movies
b/64069544

Merged-In: I7826e4d72eda52ae8b2c9f8b3ac360fb42cbb115

Change-Id: I7826e4d72eda52ae8b2c9f8b3ac360fb42cbb115
2017-08-11 01:23:15 +00:00
Jiyong Park
a731bbcfbf Merge "Build widevine tests with BOARD_VNDK_VERSION set" into oc-mr1-dev am: 21715115bc
am: a8d6af5ec2

Change-Id: I494add05603760ee2acafa2b508b5d7f2585f0e2
2017-08-09 02:43:58 +00:00
Jiyong Park
a8d6af5ec2 Merge "Build widevine tests with BOARD_VNDK_VERSION set" into oc-mr1-dev
am: 21715115bc

Change-Id: I85a599643c184126da5f1f0046624e0e8f6c4a68
2017-08-09 02:38:22 +00:00
TreeHugger Robot
21715115bc Merge "Build widevine tests with BOARD_VNDK_VERSION set" into oc-mr1-dev 2017-08-09 02:32:48 +00:00
John Bruce
6f27c36dc4 Merge "Get System ID From OEM Cert" into oc-mr1-dev am: 6dad75e395
am: 985a3c4ea9

Change-Id: I418409dcf8ada4282137aebcceb0457132c6874a
2017-08-08 00:16:34 +00:00
Yifan Hong
14435d3ef4 Merge "Move widevine unit tests to vendor." into oc-mr1-dev am: 0e52773ff7
am: 44b5a84259

Change-Id: I3e8e9f2fa57159e2869397c209e1858eab0390e4
2017-08-08 00:16:25 +00:00
John Bruce
985a3c4ea9 Merge "Get System ID From OEM Cert" into oc-mr1-dev
am: 6dad75e395

Change-Id: I2cc708e25538c3a845938b104693cc84dbea7c7e
2017-08-08 00:00:56 +00:00
Yifan Hong
44b5a84259 Merge "Move widevine unit tests to vendor." into oc-mr1-dev
am: 0e52773ff7

Change-Id: I0fe6968f44e0ba211f360b57652e2e43002ea8a4
2017-08-08 00:00:45 +00:00
John Bruce
6dad75e395 Merge "Get System ID From OEM Cert" into oc-mr1-dev 2017-08-07 23:50:21 +00:00
TreeHugger Robot
0e52773ff7 Merge "Move widevine unit tests to vendor." into oc-mr1-dev 2017-08-07 23:40:40 +00:00
Jiyong Park
853773dd93 Build widevine tests with BOARD_VNDK_VERSION set
The tests are using vendor only libs such as libcdm and libwvlevel3,
thus marked as LOCAL_PROPRIETARY_MODULE to use the libs. In addition,
the dependency to libmedia is changed to libmedia_omx since libmedia is
not available to vendor modules. UniquePtr is replaced with
std::unique_ptr since UniquePtr.h in /libnativehelper is not available
to vendors (and will not be completely removed in a near future).

Bug: 37342627
Test: BOARD_VNDK_VERSION=current m -j tests

Change-Id: I4e9d3267b20c1d52f57664b89f15330e2ebd953d
2017-08-07 16:28:28 +09:00
Yifan Hong
5e8f727b71 Move widevine unit tests to vendor.
Test: BOARD_VNDK_VERSION=current m checkbuild -j
Test: ./build_and_run_all_tests.sh

Bug: 33241851
Change-Id: I97c8fcc84bc19d88e8aa941eb283089c8ecf47d5
2017-08-04 15:26:26 -07:00
Edwin Wong
c2145bbcef Replace toStatus indirection. am: 485f11483c
am: 213ef42448

Change-Id: I1d67208986e5d2f2eb3464d5d14a32b6beb47c90
2017-08-04 04:07:18 +00:00
Edwin Wong
213ef42448 Replace toStatus indirection.
am: 485f11483c

Change-Id: I4a650aaee96a659ec35d9be361f6027da91c47ff
2017-08-04 04:01:18 +00:00
Edwin Wong
485f11483c Replace toStatus indirection.
CdmResponseType are mapped to android::status_t, then map to hidl
android::hardware::drm::V1_0::Status. This CL removes the indirection
by mapping cdm errors to hidl Status.

Test: Play Movies (pin and streaming)
Test: Netflix (download and streaming)
Test: libwvdrmmediacrypto_hidl_test and libwvdrmdrmplugin_hidl_test
Test: GtsMediaTestCases module
Test: Vts - VtsHalDrmV1_0Target

bug: 34682447
Change-Id: I0b04f47871f5e4898e7297831d5fceab52e0f7f9
2017-08-03 17:57:44 -07:00
John W. Bruce
4d448d8165 Get System ID From OEM Cert
(This is a merge from http://go/wvgerrit/30220)

Previously, extracting the system ID was only supported on Keybox-based
systems. This patch adds support for extracting the system ID from the
OEM Certificate chain on Provisioning 3.0 devices. This is done by
getting the Widevine intermediate cert from the chain, finding the
Widevine System ID extension in that cert, and extracting the value.

The code that does the extraction is separate from any code that calls
OEMCrypto so that it can be unit-tested in isolation. This patch adds a
crypto_session_unittest test to do this unit-testing.

Bug: 34776194
Test: crypto_session_unittest
Change-Id: I3e273968208fb31ae6019ccc383b419625d1ae22
2017-07-26 20:31:39 -07:00
Thierry Strudel
01ff9a9ebf Merge commit '4e53212b0ea8f240f4345170e81abc8efba8feab' into oc-mr1-dev am: 496b184ddd
am: 415dfb927e

Change-Id: I161d6cda35ddaf8b61d04a902a3aa38a871c1c91
2017-07-26 02:38:10 +00:00
Thierry Strudel
415dfb927e Merge commit '4e53212b0ea8f240f4345170e81abc8efba8feab' into oc-mr1-dev
am: 496b184ddd

Change-Id: I4e7eb0550d51d2cdc57f21fe941fe81fa5ce11af
2017-07-26 02:34:40 +00:00
Thierry Strudel
496b184ddd Merge commit '4e53212b0ea8f240f4345170e81abc8efba8feab' into oc-mr1-dev
Change-Id: I85c1a0cd5a6fa29ec4cf8a0f96f6cec32a7147ab
2017-07-25 16:55:09 -07:00
TreeHugger Robot
cb0267404c Merge "Add dependencies on org.apache.http.legacy where needed" 2017-07-25 10:33:48 +00:00
Paul Duffin
940146a195 Add dependencies on org.apache.http.legacy where needed
Incorporates two main changes:
* Stops statically including the org.apache.http.legacy library. That library is
  a stubs library so it makes no sense to statically include it.
* Adds uses-library declaration for org.apache.http.legacy to those packages
  that depend on org.apache.http.legacy, either directly or transitively.

The following change descriptions were generated automatically and so
may be a little repetitive. They are provided to give the reviewer
enough information to check the comments match what has actually been
changed and check the reasoning behind the changes.

* libwvdrmengine/test/castv2/AndroidManifest.xml
    Added <uses-library> for org.apache.http.legacy to ensure classes
    are provided at runtime. It is marked as optional as the
    application is intended to be run on versions that do not provide
    the library, but provide the classes by default, i.e. its
    minSdkVersion is < M (23).

* libwvdrmengine/test/java/AndroidManifest.xml
    Added <uses-library> for org.apache.http.legacy to ensure classes
    are provided at runtime. It is marked as optional as the
    application is intended to be run on versions that do not provide
    the library, but provide the classes by default, i.e. its
    minSdkVersion is < M (23).

Bug: 18027885
Test: m -j32 droid && adb reboot bootloader && fastboot flashall -w
Change-Id: I4eb4621bc4c2f481c0d909acac871187f006e145
2017-07-25 09:14:51 +01:00
Thierry Strudel
a8e81323d6 Merge commit '0bb98237cdc46de2b9c08f53fc7d4c1a785eb20e' into HEAD
am: be5db1a7b6

Change-Id: I1818919cd63b9e0808ef126020d430d77053f288
2017-07-24 21:24:36 +00:00
Thierry Strudel
be5db1a7b6 Merge commit '0bb98237cdc46de2b9c08f53fc7d4c1a785eb20e' into HEAD
Change-Id: I2ffb754cb7355d84325dd7e4b9eb33ca3b18fc2d
2017-07-24 12:27:14 -07:00
Thierry Strudel
0bb98237cd Revert "Temporarily disable WV L1"
am: 4e53212b0e

Change-Id: I497aa043991af370babe49e02f9828f4f0281dc9
2017-07-24 06:14:00 +00:00
Rahul Frias
a9f829b20c Merge "Support provisioning 3.0" into oc-mr1-dev am: 59daaa9dd4
am: 49494c797a

Change-Id: I43045903c47ff41f7bdfc49de978bdc0a4175234
2017-07-24 05:51:22 +00:00
Rahul Frias
49494c797a Merge "Support provisioning 3.0" into oc-mr1-dev
am: 59daaa9dd4

Change-Id: I5d1d87894f14e602c1caefff9be21a200dc41830
2017-07-24 05:46:52 +00:00
Rahul Frias
59daaa9dd4 Merge "Support provisioning 3.0" into oc-mr1-dev 2017-07-24 05:38:49 +00:00
Rahul Frias
e61259e075 Support provisioning 3.0
[ Merge of http://go/wvgerrit/29004 ]

Enable support for provisioning with OEM certificates as root of
trust.

b/62972441

Test: WV unit/intgration test, cdm_feature_test and GTSMediaTestCases

Change-Id: I30576fc0bb68a873eeaaca03f6b9c89fa6a14327
2017-07-23 18:00:23 +00:00
Thierry Strudel
4e53212b0e Revert "Temporarily disable WV L1"
This reverts commit 0bbbf7d84e.

Bug: 63632557
Change-Id: Icfd7ae4dda47449ad6178568c4bec18c898fa5b9
Signed-off-by: Thierry Strudel <tstrudel@google.com>
2017-07-21 19:49:49 -07:00
Jeff Tinker
7a7a281adf Merge "Correct watchdog timeout am: bfef9c5748 am: 0d526131b9" into oc-mr1-dev-plus-aosp
am: bc89d3eab2

Change-Id: I4ffdf7a866d128a2e452cdda2b32a6d7771d8cc4
2017-07-21 22:17:32 +00:00
Jeff Tinker
96e67486e6 Correct watchdog timeout am: bfef9c5748 am: f0491381d6
am: bde861652c

Change-Id: Ia407b5ff9d85a876cf09e57c187fa91bbbcb9e5a
2017-07-21 22:17:21 +00:00
Android Build Merger (Role)
bc89d3eab2 Merge "Correct watchdog timeout am: bfef9c5748 am: 0d526131b9" into oc-mr1-dev-plus-aosp 2017-07-21 22:13:26 +00:00
Jeff Tinker
bde861652c Correct watchdog timeout am: bfef9c5748
am: f0491381d6

Change-Id: Ie5f942863f5d8a004571b4dc33215c2f68f93cca
2017-07-21 22:13:19 +00:00