Commit Graph

2744 Commits

Author SHA1 Message Date
Rahul Frias
aa536ec97f Merge "Address Cdm Extended Duration Test failures" into pi-dev 2018-05-14 22:30:40 +00:00
Rahul Frias
184e0d0559 Address Cdm Extended Duration Test failures
[ Merge of http://go/wvgerrit/49980 ]

This CL
* corrects some of the test expectations
* switches test content used to test streaming with provider session tokens.
  The policy of the earlier test content had changed.
* adds some more information to log messages

Bug: 63819720
Test: WV unit, integration tests, WvCdmExtendedDuraionTest,
      GtsMediaDrmTest

Change-Id: I8fdbc9c38d6018cc6e884e1b95b2e9d26e7aa536
2018-05-11 14:27:45 -07:00
Adam Stone
5c5ccc0f83 Merge "Fix API support for Widevine vendor metrics" into pi-dev am: a6ad2933fb
am: de1fca26e1

Change-Id: I18638b138f9719f7030c4ef0bce3d951049f3792
2018-05-10 10:23:15 -07:00
Adam Stone
de1fca26e1 Merge "Fix API support for Widevine vendor metrics" into pi-dev
am: a6ad2933fb

Change-Id: I24e081e92e57a216e7ccd568b73025ec9fbf5891
2018-05-10 10:12:26 -07:00
Adam Stone
a6ad2933fb Merge "Fix API support for Widevine vendor metrics" into pi-dev 2018-05-10 17:00:24 +00:00
Rahul Frias
4a72ac6afa Merge "Close CDM sessions only if opened" into pi-dev am: aa183af75b
am: 1a84f8eac9

Change-Id: Icb92dd93b0864631ee89f0856b2cf7f4ddac1336
2018-05-09 15:35:13 -07:00
Adam Stone
e7edb5d2e2 Fix API support for Widevine vendor metrics
This fixes Widevine's getMetrics call so that it will return vendor
metrics through the Drm plugin 1.1 interface.

Bug: 73724453
Test: New and existing unit tests. Updated and existing GTS. Google Play manual.

Change-Id: Ie35128dc80bd6eabf9e1f3b9c1800256af77bc51
2018-05-09 15:31:34 -07:00
Fred Gylys-Colwell
87689ed4d4 Merge "Use 128 bit AES for key control block" into pi-dev am: f29901e310
am: baa3ba92fb

Change-Id: Id2c7de8a36cec82e47be7c3a4f2147e2ffde4533
2018-05-09 15:30:43 -07:00
Rahul Frias
1a84f8eac9 Merge "Close CDM sessions only if opened" into pi-dev
am: aa183af75b

Change-Id: I1d89fe1f4d03e77534fb4cc9fb7b7d65ec38165c
2018-05-09 15:13:38 -07:00
Fred Gylys-Colwell
baa3ba92fb Merge "Use 128 bit AES for key control block" into pi-dev
am: f29901e310

Change-Id: Ic670f17249e8c601a1018c72437bbb7687c91558
2018-05-09 15:13:22 -07:00
Fred Gylys-Colwell
717f608e66 Add unit test for nonce sharing am: a313985174
am: 4440ad4d68

Change-Id: I44f6fd199542b8f311470dc9e66326d1da435651
2018-05-09 15:00:00 -07:00
Rahul Frias
aa183af75b Merge "Close CDM sessions only if opened" into pi-dev 2018-05-09 21:59:29 +00:00
TreeHugger Robot
f29901e310 Merge "Use 128 bit AES for key control block" into pi-dev 2018-05-09 21:57:29 +00:00
Fred Gylys-Colwell
4440ad4d68 Add unit test for nonce sharing
am: a313985174

Change-Id: I03b71ed4684555ea20059bbc90ea89cc6c54e8c7
2018-05-09 14:49:43 -07:00
Fred Gylys-Colwell
a313985174 Add unit test for nonce sharing
Merge from Widevine repo of http://go/wvgerrit/49302

This CL adds some unit tests to verify that several OEMCrypto sessions
do not share nonce tables.

bug: 64850992
test: unit tests run on sailfish, taimen, and walleye.
Change-Id: I06cf3fdafb84f8b09cf2f0e58c1866bac511a293
2018-05-08 14:30:37 -07:00
Fred Gylys-Colwell
98532d313b Use 128 bit AES for key control block
Merge from Widevine repo of http://go/wvgerrit/49805

This aligns the oemcrypto reference code and unit tests to match the
API design doc: http://go/oemcrypto

bug: 79375509
test: unit tests pass
Change-Id: I13761a7384a17e99d88e61aaf80b4a22941fd172
2018-05-08 14:01:45 -07:00
Rahul Frias
9c95aba4f5 Close CDM sessions only if opened
[ Merge of http://go/wvgerrit/49822 ]

This avoids logging an unnecessary error, when the session is not found.

Bug: 79210873
Test: Wv unit/integration test, GtsMediaDrmTest, playback with Play
      Movies and Netflix.

Change-Id: Ifef99d1380d763670ad0fa89c885fb5fd41567e2
2018-05-08 00:30:46 -07:00
Rahul Frias
cca2dc9cff Avoid race conditions between periodic timer and close sessions am: 5b169b1722
am: 934e0aeff8

Change-Id: I99d34d1038eca0ea567b985f65104b65f0fbce8e
2018-05-04 09:25:46 -07:00
Rahul Frias
934e0aeff8 Avoid race conditions between periodic timer and close sessions
am: 5b169b1722

Change-Id: Ibd7d1f58e4ba17dd29baee1a788193ffd17aa7c6
2018-05-04 09:19:43 -07:00
Rahul Frias
5b169b1722 Avoid race conditions between periodic timer and close sessions
[ Merge of http://go/wvgerrit/49402 ]

Bug: 78912546
Test: WV unit/integration tests, GtsMediaTestCases, Aupt tests
Change-Id: Ic2016e8b557cd2dd45d5d3bbaa28be16e58dab8b
2018-05-02 23:56:17 -07:00
Rahul Frias
377279169c Merge "Allow a service certificate to be specified for provisioning" into pi-dev am: 734b6b819e
am: bd52f22081

Change-Id: Ibcc3857f7588d658d8d1f18b2eb7a31d9714d721
2018-05-02 17:06:28 -07:00
Rahul Frias
bd52f22081 Merge "Allow a service certificate to be specified for provisioning" into pi-dev
am: 734b6b819e

Change-Id: I4c76246a836901ea6d7fa73fa8292a8ab8bfb7fc
2018-05-02 15:04:56 -07:00
Rahul Frias
734b6b819e Merge "Allow a service certificate to be specified for provisioning" into pi-dev 2018-05-02 21:51:54 +00:00
android-build-team Robot
1e5d40a74c Merge "Share Widevine DRM Device Provisioning Models doc" into pi-dev am: 81ce8b4601
am: af5e1bdce7

Change-Id: I8c669f10880c839cfb9b51546809ed548719ce25
2018-04-27 16:47:14 -07:00
android-build-team Robot
af5e1bdce7 Merge "Share Widevine DRM Device Provisioning Models doc" into pi-dev
am: 81ce8b4601

Change-Id: I9cb81adf8acc5261ea0b5f48a2cd253635457d42
2018-04-27 16:42:39 -07:00
android-build-team Robot
81ce8b4601 Merge "Share Widevine DRM Device Provisioning Models doc" into pi-dev 2018-04-27 23:38:05 +00:00
Fred Gylys-Colwell
530c77bffb Share Widevine DRM Device Provisioning Models doc
Merge from Widevine repo of http://go/wvgerrit/47760

This CL adds a pdf of the document Widevine DRM Device Provisioning
Models, which explains the difference between Provisioning 2.0 and
3.0.

bug: http://b/74242000 Update Integration Guide
test: documentation only.
Change-Id: I64026ab4e93931adaa168d99939ee71d760e5862
2018-04-27 13:30:22 -07:00
Rahul Frias
668f387ff6 Save usage information before closing a session am: 9ba6493e1b
am: 86a1b18c24

Change-Id: I021e8792da5051f3a7cde08a7af33409e2c81194
2018-04-26 17:13:03 -07:00
Rahul Frias
86a1b18c24 Save usage information before closing a session
am: 9ba6493e1b

Change-Id: If189b6bb2edc6e8b10f2274775cb8caaff89a412
2018-04-26 16:56:34 -07:00
Rahul Frias
9ba6493e1b Save usage information before closing a session
[ Merge of http://go/wvgerrit/48640 ]

Usage information is saved periodically, in order to avoid excessive
flash writes. This limits our session usage accuracy to
within a usage save period. Saving usage information when
closing a session is an improvement and addresses some failures
seen with Netflix compliance tests.

Bug: 74015553
Test: WV unit/integration tests
Change-Id: I680aad05922f334df0611ff3933082a512f7c002
2018-04-26 14:14:51 -07:00
Rahul Frias
86c93da973 Merge "Remove duplicate information from client identification" into pi-dev am: 40b1131c13
am: aaf3d3da0c

Change-Id: Ia35736d5226fbb99412bc0850a5d7f9cb517ce38
2018-04-26 13:54:13 -07:00
Rahul Frias
aaf3d3da0c Merge "Remove duplicate information from client identification" into pi-dev
am: 40b1131c13

Change-Id: Ie587de42c6b18a5612962e68cb7e506b3843f6e5
2018-04-26 13:46:04 -07:00
Rahul Frias
40b1131c13 Merge "Remove duplicate information from client identification" into pi-dev 2018-04-26 20:29:36 +00:00
Rahul Frias
d7e0a3562c Remove duplicate information from client identification
[ Merge of http://go/wvgerrit/48720 ]

The device ID does not need to be sent in the client identification
information as it is either present in other fields or ignored
by the license service.

This also allows for build information to be reported during
provisioning for devices with OEM certificates.

Bug: 78578351
Test: WV unit/integration tests. GtsMediaTestCases.
Change-Id: I708c63d34f0e2df7e465154d12096a394a1b23d7
2018-04-25 17:21:40 -07:00
Adam Stone
1e471cdf3f Merge "Remove a spammy log message from metrics collections." into pi-dev am: 6d3dbfca83
am: 25a8f93b2a

Change-Id: Ib4b6d915f6a78476223bca84fb467870ebf2ae74
2018-04-25 17:18:44 -07:00
Adam Stone
25a8f93b2a Merge "Remove a spammy log message from metrics collections." into pi-dev
am: 6d3dbfca83

Change-Id: I04c1e4bedb75c3cee9fcebd4d3e1a204145d164e
2018-04-25 17:13:49 -07:00
Adam Stone
6d3dbfca83 Merge "Remove a spammy log message from metrics collections." into pi-dev 2018-04-26 00:08:33 +00:00
Srujan Gaddam
f2783ecb19 Merge "Address offline playback with rollbacked time" into pi-dev am: 04ad84a533
am: 58549580c6

Change-Id: I06dcb4520ff2c72cef8f79e38c2acec2ecdc6eb7
2018-04-25 11:30:46 -07:00
Srujan Gaddam
58549580c6 Merge "Address offline playback with rollbacked time" into pi-dev
am: 04ad84a533

Change-Id: I397dbb095c7139c82e800830eb1ea3baa2f7c61f
2018-04-25 11:01:40 -07:00
Srujan Gaddam
04ad84a533 Merge "Address offline playback with rollbacked time" into pi-dev 2018-04-25 17:34:31 +00:00
Rahul Frias
816f00e533 Allow a service certificate to be specified for provisioning
[ Merge of http://go/wvgerrit/48400 ]

Client identification information has recently been enabled in
provisioning messages. For privacy concerns this information
is being encrypted with a default service certificate.
Apps need to be able to override the default one to allow
for provisioning with third party provisioning services.

Bug: 78420508
Test: WV unit, integration tests
      New WvCdmRequestLicenseTest.ProvisioningTestWithServiceCertificate test
      GTS MediaDrmTestCases

Change-Id: Iee61ad47d33ce011efbea4eb90f7e4b1f032d15f
2018-04-24 11:14:35 -07:00
John Bruce
4ac9a39f45 Merge "Update OS Version in Version Canary" into pi-dev am: e3e437a6eb
am: e2235aee09

Change-Id: I1f4e84eaf88bd954989c6207326d0a11d3e1212c
2018-04-23 18:33:35 -07:00
John Bruce
e2235aee09 Merge "Update OS Version in Version Canary" into pi-dev
am: e3e437a6eb

Change-Id: I5049b33a464b19f39aac68d23c5d39866b8f5c07
2018-04-23 18:11:49 -07:00
John Bruce
e3e437a6eb Merge "Update OS Version in Version Canary" into pi-dev 2018-04-24 01:02:59 +00:00
Srujan Gaddam
73c3007c24 Address offline playback with rollbacked time
Merge from http://go/wvgerrit/47640

Test: unit/integration tests

Bug: b/62058202

The usage table keeps track of license duration by using the current
system time. However, if a user were to rollback the time, they can
effectively continue offline playback indefinitely. This changes the way
we compute time by computing offsets by which the user rollbacked the
time and adding it to the current time. This change also includes a test
to verify protection against rollback for usage entries that is only run
when the user is root.

Change-Id: I97c430e1443747b0f9759ae5390b8f5d06bdebf1
2018-04-23 15:44:26 -07:00
Rahul Frias
8184c43b72 Merge "Enable encryption of client ID for provisioning" into pi-dev am: d873f40d80
am: e51a3fa402

Change-Id: I20fe0ad5d1fe54c2e0468810bd35436bdfa596d4
2018-04-23 15:16:58 -07:00
Rahul Frias
e51a3fa402 Merge "Enable encryption of client ID for provisioning" into pi-dev
am: d873f40d80

Change-Id: I4f2e613570b16e97141b9e4b8843f78e6123d92c
2018-04-23 15:08:35 -07:00
Rahul Frias
d873f40d80 Merge "Enable encryption of client ID for provisioning" into pi-dev 2018-04-23 22:03:53 +00:00
Rahul Frias
a8d236cb88 Prevent race conditions between decrypt and close session am: 07bb4de042
am: 909650a0b3

Change-Id: I9effccd42b5e083363a2c213ff289f667cc4a71e
2018-04-23 07:10:39 -07:00
Rahul Frias
909650a0b3 Prevent race conditions between decrypt and close session
am: 07bb4de042

Change-Id: I3f52a62587b90aab7d4e22a6257edbefc059721c
2018-04-23 07:02:38 -07:00