widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,719 Commits 2 Branches 0 Tags
5eb7d21fd5c455e792d29a5c74f65cf8566ef2fa
Commit Graph

4719 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Dale
aa7ed24123 Merge "Log X-Google fields on failed HTTP requests." 2020-08-10 20:34:12 +00:00
Alex Dale
02243a7712 Merge "Handle unlimited usage table capacity." am: be2e32d09e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12221244

Change-Id: Ia570cb4672d1b0b7a65030be49de0ceb97811b01
 2020-08-07 20:51:41 +00:00
Alex Dale
be2e32d09e Merge "Handle unlimited usage table capacity." 2020-08-07 20:35:43 +00:00
Rahul Frias
e50c7d6ed1 Allow offline licenses to be loaded and restored in the same session am: 79eabb0989 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12309365

Change-Id: I04f37e6440e7f09ed40df3c3d65cd3ff3f31b83f
 2020-08-07 09:46:25 +00:00
Rahul Frias
49e53ffdfe Log OEMCrypto_CloseSession error 
[ Merge of http://go/wvgerrit/103643 ]

Bug: 161417560
Test: WV unit/integration test
Change-Id: I2d7e3b90e2e34e7854dea7aac865f8577d113aab
 2020-08-05 02:20:28 -07:00
Rahul Frias
79eabb0989 Allow offline licenses to be loaded and restored in the same session 
[ Merge of http://go/wvgerrit/103243 ]

Include review comments from wv gerrit CL.

Bug: 161551490
Test: WV unit integration tests, GtsMediaTestCases and
      WidevineConcurrentDrmCertificatesTest#testConcurrentDrmCertificates,
      MediaDrmTest#testMultipleLoadKeys on a redfin
Change-Id: Ie9b41a2e68b95692f9353578f6955637411d4dfc
 2020-08-04 15:02:06 -07:00
Alex Dale
147c9e0afa Log X-Google fields on failed HTTP requests. 
[ Merge of http://go/wvgerrit/103395 ]

To help with debugging failures in HTTP requests during unit tests,
this CL adds logging for Google's debugging response header fields.
These fields are of the type "X-Google-*" or "x-google-*" and provide
information such as the service name, server cell, error details, and
other details that can help isolate the cause of failure on the
server's end.

An additional unittest has been created to test the parser for the
header fields.

Tests that are known to exprience HTTP failures have been extended
to include logs for these fields should they be present.

Bug: 137619348
Test: Linux unit tests and Jenkins test
Change-Id: I69959af2ba91510f345bbb02cf7ca35c3f1119da
 2020-07-30 17:24:11 -07:00
Alex Dale
99335a6aa8 DO NOT MERGE Handle unlimited usage table capacity. 
[ Merge of http://go/wvgerrit/103684 ]
[ Cherry pick of http://ag/12221244 ]

The OEMCrypto method for usage table capacity can return zero to
indicate that the usage table size is not explicitly limited.  The
CDM must handle this case with regard to the CDM's usage table
management and information querying.

The usage table initialization tests are extended to include cases
where the table does not have a defined limit.

AddEntry() was missing call to update the usage table header after
creating a new usage entry.  This call is now included and required
additional changes to the usage table unit tests.

Bug: 160560364
Test: Android unit tests
Change-Id: Ica5d181092d2938d24deba5005a211ca883cb0f0
 2020-07-29 17:45:21 -07:00
Alex Dale
def1a778b6 Handle unlimited usage table capacity. 
[ Merge of http://go/wvgerrit/102945 ]

The OEMCrypto method for usage table capacity can return zero to
indicate that the usage table size is not explicitly limited.  The
CDM must handle this case with regard to the CDM's usage table
management and information querying.

The usage table initialization tests are extended to include cases
where the table does not have a defined limit.

AddEntry() was missing call to update the usage table header after
creating a new usage entry.  This call is now included and required
additional changes to the usage table unit tests.

Bug: 160560364
Test: Android unit tests
Change-Id: Ica5d181092d2938d24deba5005a211ca883cb0f0
 2020-07-27 15:36:25 -07:00
Automerger Merge Worker
a5cbc48c85 Merge "Allow offline licenses to be loaded and restored in the same session am: 3709a4f419 am: 5cb846db83" into rvc-qpr-dev-plus-aosp am: 8de7e42545 am: df603cbaa1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12209028

Change-Id: Ie4d3452bfcdc3053c572d56b0b533e78d292a01b
 2020-07-26 19:07:30 +00:00
Rahul Frias
de75af70e8 Allow offline licenses to be loaded and restored in the same session am: 3709a4f419 am: 693d58e17d am: e37249c1de am: c8cff5274c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12209028

Change-Id: If45bd3e4c858ee3c8225e4a9ab9f140b985ae3ac
 2020-07-26 19:07:24 +00:00
Automerger Merge Worker
df603cbaa1 Merge "Allow offline licenses to be loaded and restored in the same session am: 3709a4f419 am: 5cb846db83" into rvc-qpr-dev-plus-aosp am: 8de7e42545 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12209028

Change-Id: I71b44f173d7e3708104d1efe1a42ff54b25a382c
 2020-07-26 18:48:46 +00:00
Rahul Frias
c8cff5274c Allow offline licenses to be loaded and restored in the same session am: 3709a4f419 am: 693d58e17d am: e37249c1de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12209028

Change-Id: I53f56740230c5e085f6210d5149cc4a77d475a8d
 2020-07-26 18:48:36 +00:00
Automerger Merge Worker
8de7e42545 Merge "Allow offline licenses to be loaded and restored in the same session am: 3709a4f419 am: 5cb846db83" into rvc-qpr-dev-plus-aosp 2020-07-26 18:35:09 +00:00
Rahul Frias
f68b9d3575 Allow offline licenses to be loaded and restored in the same session am: 3709a4f419 am: 5cb846db83 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12209028

Change-Id: Ifb7157752ab3cbfcd4e0a5b21136a43420947a4f
 2020-07-26 18:35:02 +00:00
Rahul Frias
e37249c1de Allow offline licenses to be loaded and restored in the same session am: 3709a4f419 am: 693d58e17d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12209028

Change-Id: If71a6573a618910478b3c0d9f8b9eb34d72fd9c0
 2020-07-26 18:34:59 +00:00
Rahul Frias
5cb846db83 Allow offline licenses to be loaded and restored in the same session am: 3709a4f419 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12209028

Change-Id: I105d1e1b88a554a3ef9cd2174b2210c15852b0e0
 2020-07-26 18:11:50 +00:00
Rahul Frias
693d58e17d Allow offline licenses to be loaded and restored in the same session am: 3709a4f419 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12209028

Change-Id: I5911f1d09a15d8ec266d60c22314b21e20788a30
 2020-07-26 18:11:39 +00:00
Rahul Frias
3709a4f419 Allow offline licenses to be loaded and restored in the same session 
[ Merge of http://go/wvgerrit/103243 ]

In v16, OEMCrypto specifications required that an error be returned if
multiple attempts are made to load an offline license into a session.
This caused the GTS test testConcurrentDrmCertificates to fail. It was
introduced to verify that a license could retrieved and loaded into a
session and then restored. This was based on an app use case.

Ideally we would like to disallow a this behavior but need to make sure
it is not being used by apps.

For now this will be allowed. If detected, the CDM will reintialize the
OEMCrypto session and allow the license to be restored.

Bug: 161551490
Test: WV unit integration tests, GtsMediaTestCases and
      WidevineConcurrentDrmCertificatesTest#testConcurrentDrmCertificates,
      MediaDrmTest#testMultipleLoadKeys on a redfin
Change-Id: I0834e4419c3a6dccfd77aaea3afa3d65c2c0c742
 2020-07-24 07:27:19 -07:00
Rahul Frias
47e210ca67 Merge "Correct WV log spam" am: d6c8348229 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12157508

Change-Id: If30b83beddb75e1a4d1c8e680284893927e55b84
 2020-07-24 06:46:20 +00:00
Rahul Frias
d6c8348229 Merge "Correct WV log spam" 2020-07-24 06:33:23 +00:00
Robert Shih
6eea529919 PolicyTimersV16: override base class HasRenewalDelayExpired am: d9112ff7e1 am: 951877a8ec am: 0d3f31559a am: e9492a8ab1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12184963

Change-Id: Ide2d4e02ed2b44aaa051e6e66d8a2794c538868a
 2020-07-24 00:34:42 +00:00
Robert Shih
9ab50f5706 PolicyTimersV16: override base class HasRenewalDelayExpired am: d9112ff7e1 am: 035254e828 am: 6c6cbc95df am: 41c6222c49 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12184963

Change-Id: Ic98c6015ebabc1fe65726d6ccdcc884621c1fc69
 2020-07-24 00:34:37 +00:00
Robert Shih
e9492a8ab1 PolicyTimersV16: override base class HasRenewalDelayExpired am: d9112ff7e1 am: 951877a8ec am: 0d3f31559a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12184963

Change-Id: I4c35a5573842869f0514dda223fe87c4672b5e2e
 2020-07-24 00:17:00 +00:00
Robert Shih
41c6222c49 PolicyTimersV16: override base class HasRenewalDelayExpired am: d9112ff7e1 am: 035254e828 am: 6c6cbc95df 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12184963

Change-Id: I183964f4454b2718623cfaf471bdd92a5394322e
 2020-07-24 00:16:41 +00:00
Robert Shih
0d3f31559a PolicyTimersV16: override base class HasRenewalDelayExpired am: d9112ff7e1 am: 951877a8ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12184963

Change-Id: I3f291f5f0c200d7678999e0ed3552cb6d0a37706
 2020-07-24 00:04:01 +00:00
Robert Shih
6c6cbc95df PolicyTimersV16: override base class HasRenewalDelayExpired am: d9112ff7e1 am: 035254e828 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12184963

Change-Id: I01a10b72bb3a803197a814c74bcc04e5eaac3948
 2020-07-24 00:03:01 +00:00
Robert Shih
951877a8ec PolicyTimersV16: override base class HasRenewalDelayExpired am: d9112ff7e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12184963

Change-Id: Ic030fa19260c55a47686507abc7bec3b41253d77
 2020-07-23 23:46:28 +00:00
Robert Shih
035254e828 PolicyTimersV16: override base class HasRenewalDelayExpired am: d9112ff7e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12184963

Change-Id: I416235b868332a0a93ce9d2a8310350d9ffef733
 2020-07-23 23:46:10 +00:00
Rahul Frias
b02c9fc8ca Correct WV log spam 
[ Merge of http://go/wvgerrit/102923 ]

Avoid logging an error, on first boot, when trying to retrieve a
certificate that does not yet exist.

Bug: 161201883
Test: WV unit/integration tests
Change-Id: I293f9766a7f2024107d0db45a874a9478b0c3959
 2020-07-23 15:00:37 -07:00
Robert Shih
d9112ff7e1 PolicyTimersV16: override base class HasRenewalDelayExpired 
Base class uses license_start_time_ which is not updated on renewals.

Merge of http://go/wvgerrit/103123

Bug: 161023174
Bug: 161621246
Test: WidevineDashPolicyTests#testL1RenewalDelay5S
Test: WidevineDashPolicyTests#testL1RenewalDelay13S
Change-Id: I16056d492bea4dd721984998b5cf38409fe3b055
 2020-07-23 21:06:29 +00:00
Edwin Wong
1e03055fc4 Merge "Remove android.hardware.drm@1.0 references in doc." am: 89a1404e05 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12204720

Change-Id: Ifaa87606766d3264311aa1629948d1e3aee622be
 2020-07-22 22:37:50 +00:00
Edwin Wong
89a1404e05 Merge "Remove android.hardware.drm@1.0 references in doc." 2020-07-22 22:22:18 +00:00
Edwin Wong
4f4163d966 Remove android.hardware.drm@1.0 references in doc. 
We no longer need android.hardware.drm@1.0-impl and
android.hardware.drm@1.0-service. Remove reference in doc.

Merged from http://go/wvgerrit/103183

Please see revision history in:
https://docs.google.com/document/d/19pSOpV5_6AtyK82p1b5DajlYZnVOfyL63p5h72yWW5k/edit?usp=sharing

Test: view changed doc, ensure watermark is embeded

bug: 161811892
Change-Id: I5872f072382a0c331b25a004175e87bf54735d00
 2020-07-21 14:36:31 -07:00
Automerger Merge Worker
b8646079af Merge "Merge "Start rental clock when nonce-free offline license loaded" into rvc-d1-dev am: d24b3d4bd2 am: 7f873c03fd" into rvc-qpr-dev-plus-aosp am: d56089551e am: 9ee586fec4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12184965

Change-Id: I99eee2694af6ac3b2fcb2e8ea5357d0ecdc94edf
 2020-07-21 11:15:46 +00:00
TreeHugger Robot
a3508ba654 Merge "Start rental clock when nonce-free offline license loaded" into rvc-d1-dev am: d24b3d4bd2 am: 84c1ff91ae am: e8cf28340a am: 37afd55f2e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12184965

Change-Id: I72f403d3d9b63b271226ae42716068b3e807d815
 2020-07-21 11:15:30 +00:00
Automerger Merge Worker
9ee586fec4 Merge "Merge "Start rental clock when nonce-free offline license loaded" into rvc-d1-dev am: d24b3d4bd2 am: 7f873c03fd" into rvc-qpr-dev-plus-aosp am: d56089551e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12184965

Change-Id: Ia0645e09af0e769985991f77ea8948bbb5e28fe7
 2020-07-21 11:05:39 +00:00
TreeHugger Robot
37afd55f2e Merge "Start rental clock when nonce-free offline license loaded" into rvc-d1-dev am: d24b3d4bd2 am: 84c1ff91ae am: e8cf28340a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12184965

Change-Id: I5d7b3212ef4d0c6f92793fb9b071dc83b2148d36
 2020-07-21 11:05:22 +00:00
Automerger Merge Worker
d56089551e Merge "Merge "Start rental clock when nonce-free offline license loaded" into rvc-d1-dev am: d24b3d4bd2 am: 7f873c03fd" into rvc-qpr-dev-plus-aosp 2020-07-21 10:50:49 +00:00
TreeHugger Robot
8d9109c46b Merge "Start rental clock when nonce-free offline license loaded" into rvc-d1-dev am: d24b3d4bd2 am: 7f873c03fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12184965

Change-Id: I93bc83f2458f6fd36fa562def376a29056f870c2
 2020-07-21 10:50:46 +00:00
TreeHugger Robot
e8cf28340a Merge "Start rental clock when nonce-free offline license loaded" into rvc-d1-dev am: d24b3d4bd2 am: 84c1ff91ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12184965

Change-Id: I87351f7ef5ba59b076ab331f45732c5e462f6db1
 2020-07-21 10:50:45 +00:00
TreeHugger Robot
7f873c03fd Merge "Start rental clock when nonce-free offline license loaded" into rvc-d1-dev am: d24b3d4bd2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12184965

Change-Id: Ie7c3dd1ea96c1ef12aafc3fb19d2acbc4b0909cf
 2020-07-21 10:39:25 +00:00
TreeHugger Robot
84c1ff91ae Merge "Start rental clock when nonce-free offline license loaded" into rvc-d1-dev am: d24b3d4bd2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12184965

Change-Id: Idb4570f166748606d74618bce155aaba81c5f9d3
 2020-07-21 10:39:10 +00:00
TreeHugger Robot
d24b3d4bd2 Merge "Start rental clock when nonce-free offline license loaded" into rvc-d1-dev 2020-07-21 10:24:53 +00:00
Fred Gylys-Colwell
bdcfbc503e Adjust nonce for v15 servers am: 7f347cd59f am: 9cf2a475e2 am: 6dbbc42d40 am: a1b92e8d1a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12173751

Change-Id: Ib69b5923b2237b24e9a535e5d76d6f9acdba2532
 2020-07-21 09:03:46 +00:00
Fred Gylys-Colwell
3473513f6a Adjust nonce for v15 servers am: 7f347cd59f am: 940a771969 am: 08fe6b1690 am: fdc024c9c0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12173751

Change-Id: I22165e6566a3ad77a43c8ea9a16284ec4c1b0707
 2020-07-21 09:03:35 +00:00
Fred Gylys-Colwell
a1b92e8d1a Adjust nonce for v15 servers am: 7f347cd59f am: 9cf2a475e2 am: 6dbbc42d40 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12173751

Change-Id: Ia466309d4d7d4f23ff458f740f35f6d3a70c9528
 2020-07-21 08:54:04 +00:00
Fred Gylys-Colwell
fdc024c9c0 Adjust nonce for v15 servers am: 7f347cd59f am: 940a771969 am: 08fe6b1690 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12173751

Change-Id: I4d55319169d3e2709568ff51336cce0ad6b04345
 2020-07-21 08:53:50 +00:00
Fred Gylys-Colwell
6dbbc42d40 Adjust nonce for v15 servers am: 7f347cd59f am: 9cf2a475e2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12173751

Change-Id: I9b99e0231fb4c0b0e652e84929a2e8393bcfa186
 2020-07-21 08:41:27 +00:00
Fred Gylys-Colwell
08fe6b1690 Adjust nonce for v15 servers am: 7f347cd59f am: 940a771969 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12173751

Change-Id: I67ed1d76737d81d039b603d85b18977845f20007
 2020-07-21 08:41:22 +00:00