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

4852 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Fred Gylys-Colwell
940a771969 Adjust nonce for v15 servers am: 7f347cd59f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12173751

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

Change-Id: If52b4180e02638e93028d0dda38b79e6d0dbd1d0
 2020-07-21 08:28:08 +00:00
Fred Gylys-Colwell
b90f88072f Start rental clock when nonce-free offline license loaded 
Merge from Widevine repo of http://go/wvgerrit/103107

When an offline license is reloaded, if it does not have a usage entry
to indicate when the rental clock was started, the start time defaults
to 0 in the ODK library (in OEMCrypto). This CL changes the code to
start the rental clock in this case. It does this by signing a dummy
message, which triggers the ODK library to start the rental clock.

Bug: 161585265
Bug: 161023174
Test: GTS tests. http://go/forrest-run/L55100000642199761
Change-Id: I4cf555b2fb43009ffb62e7b2c1a37265c3f70bfe
 2020-07-20 23:11:48 +00:00
Fred Gylys-Colwell
7f347cd59f Adjust nonce for v15 servers 
Merge from Widevine repo of http://go/wvgerrit/102783

When OEMCrypto is v16, but the license server is v15, we should not
create a new nonce for a license renewal. However, the request does
need a nonce or the license server will not generate a valid key
control block. So we should use the nonce that came from the original
license.

Bug: 160676790
Test: tested playback using netflix
Test: GTS tests. http://go/forrest-run/L55100000642199761
Change-Id: Ie1644b5abe0662387edf01f6110d82f70a64df6c
 2020-07-20 23:11:41 +00:00
Edwin Wong
d0297af973 Merge "Add arguments to Widevine lshal debug hook." am: 6fe341c845 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12052599

Change-Id: I0fd696e5cdb5ff4a17d2db514a905d7e5c403ac5
 2020-07-20 22:42:00 +00:00
Edwin Wong
6fe341c845 Merge "Add arguments to Widevine lshal debug hook." 2020-07-20 22:24:53 +00:00
Edwin Wong
5b8d21164d Add arguments to Widevine lshal debug hook. 
Add options to dump Widevine Cdm properties,
Widevine Cdm metrics, or both.

The valid arguments are Cdm Metrics (m|M) or Cdm Properties (p|P).
If no arguments are provided, both Cdm properties and
Cdm metrics will be displayed.

Test: adb shell lshal debug [drm service] [m/p]
  adb shell lshal debug android.hardware.drm@1.3::IDrmFactory/widevine

Bug: 154027349
Change-Id: I95c10dd7d4274226936295c73be4eb1612c2ef6a
 2020-07-20 13:51:38 -07:00
Rahul Frias
389afd6b21 Merge "Correct ordering of test expectations" am: 297a289a31 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12148128

Change-Id: I3262cc1fa7921da0b83b0c9e84cb2f5764f03e53
 2020-07-16 23:02:56 +00:00
Rahul Frias
297a289a31 Merge "Correct ordering of test expectations" 2020-07-16 22:45:29 +00:00
Alex Dale
79fe432e75 Usage table LRU only retrieves a single entry. am: 7ce8950c0f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12089309

Change-Id: I2fc9a816ca0306e513ecacbe1a2a97fc6adc3f17
 2020-07-15 23:13:34 +00:00
Alex Dale
7ce8950c0f Usage table LRU only retrieves a single entry. 
[ Merge of http://go/wvgerrit/102167 ]

After changes made to how the usage table is defragged by the CDM,
it was determined that there is no use in selecting more than a single
entry from the usage table to evict.  The only failure that can occur
when evicting an entry is if the last entry is in use, in that case,
evicting other entries will still result in a failure.

This change cleans up the LRU algorithm and test cases to reflect
the new functionality.

Bug: 155230578
Test: Linux unit tests
Change-Id: I817c039670d9f72c0e4f6c3fdac45c98ed5b6b21
 2020-07-14 18:37:11 -07:00
Rahul Frias
347917e505 Correct ordering of test expectations 
[ Merge of http://go/wvgerrit/102804 ]

This addresses post-merge review comments.

Bug: 150393659
Test: WV unit/integration tests
Change-Id: I221ed1c82b20bd0c2b0b824a2d52a2dd918fa459
 2020-07-14 02:24:41 -07:00
Alex Dale
84119f063b Merge "Re-enabling parallel license tests for L1 and ModMock." am: 1d136b4f94 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12104677

Change-Id: I7d0cd04feddbeec560a3c5b8e9a508539ed2f639
 2020-07-10 00:29:39 +00:00
Alex Dale
1d136b4f94 Merge "Re-enabling parallel license tests for L1 and ModMock." 2020-07-10 00:17:53 +00:00
Alex Dale
cf6cf5f4e8 Re-enabling parallel license tests for L1 and ModMock. 
[ Merge of http://go/wvgerrit/102108 ]

Several tests that make parallel license requests were disabled due
to a flaky server failure unrelated to CDM code.  Most of these tests
are now re-enabled to ensure the multi-threaded license requests is
functional on V16.

These tests remains disabled for L3 due to continued flakiness.

Added a lock around the initialization of the SSL library to prevent
issues with license requests getting garbled.

Bug: 137619348
Test: Linux and Android unit tests
Change-Id: Idffaa6039b2bde12613bb5033af32d1af6704c76
 2020-07-08 16:44:00 -07:00
John Bruce
293ab363fb Merge "Memory Leak in CertificateProvisioningTest" am: 5a27d24742 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12100495

Change-Id: I589bde7b34e7ae3898070fbcd0d0bfabdd0bc602
 2020-07-08 20:07:46 +00:00
John Bruce
5a27d24742 Merge "Memory Leak in CertificateProvisioningTest" 2020-07-08 19:56:04 +00:00