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

4456 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
android-build-team Robot
0c5a5f61e2 Snap for 6701932 from 89a1404e05 to sc-release 
Change-Id: I9b16b9a81c7d7a7fa677472f611a678d0227030a
 2020-07-23 02:12:14 +00:00
Edwin Wong
89a1404e05 Merge "Remove android.hardware.drm@1.0 references in doc." 2020-07-22 22:22:18 +00:00
android-build-team Robot
5377467a59 Snap for 6698386 from 9ee586fec4 to sc-release 
Change-Id: I9dfe4a9b76a252b88b5c3595f47ec5f85c9ac6f2
 2020-07-22 02:06:10 +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
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
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
android-build-team Robot
dc411dc187 Snap for 6695510 from 6fe341c845 to sc-release 
Change-Id: I905a0da87274a115daaf11b120753e87564bc7ef
 2020-07-21 02:01:30 +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
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
android-build-team Robot
79f6b7463e Snap for 6687149 from 297a289a31 to sc-release 
Change-Id: Id66356e9a2760f9e864291a845e116359a5f4524
 2020-07-17 02:16:37 +00:00
Rahul Frias
297a289a31 Merge "Correct ordering of test expectations" 2020-07-16 22:45:29 +00:00
android-build-team Robot
b4d5a69068 Snap for 6684008 from 7ce8950c0f to sc-release 
Change-Id: Ic034da76d8b2db0aa3a852d4793233dff8a4260e
 2020-07-16 02:04:11 +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
android-build-team Robot
1df17ae71b Snap for 6671526 from 1d136b4f94 to sc-release 
Change-Id: Iada86e2b099d1c6cf3a8c35d8e8e93daca94bd37
 2020-07-11 02:03:43 +00:00
Alex Dale
1d136b4f94 Merge "Re-enabling parallel license tests for L1 and ModMock." 2020-07-10 00:17:53 +00:00
android-build-team Robot
54de1da859 Snap for 6664315 from 5a27d24742 to sc-release 
Change-Id: If01e86b4e54cc1f3330c6d47102659691b89cc55
 2020-07-09 02:15:28 +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
5a27d24742 Merge "Memory Leak in CertificateProvisioningTest" 2020-07-08 19:56:04 +00:00
John W. Bruce
5f232c5436 Memory Leak in CertificateProvisioningTest 
(This is a merge of http://go/wvgerrit/102084.)

No one was claiming ownership of the metrics object in
CertificateProvisioningTest, resulting in a leak. This patch makes the
test hold onto ownership.

Bug: 159486086
Test: CE CDM Unit Tests
Test: Android Unit Tests
Change-Id: I84710782b7a60d6bd3a7eda981de4f0af877fc39
 2020-07-07 15:07:16 -07:00
android-build-team Robot
8c24310b7a Snap for 6657286 from 1cd67ca8f9 to sc-release 
Change-Id: I4b059ef75827bda78c8db3932d1d8ddea62f6873
 2020-07-07 02:02:02 +00:00
Robert Shih
1cd67ca8f9 GetDecryptHashSupport: recognize OEMCrypto_ERROR_NOT_IMPLEMENTED am: da09f4abca am: f240709ef2 am: 918dba59f1 am: ba2e3e41f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12036417

Change-Id: Icca161e90011977563be7d02296b005e5edb0828
 2020-07-07 00:36:28 +00:00
Robert Shih
83c6e2e9bc GetDecryptHashSupport: recognize OEMCrypto_ERROR_NOT_IMPLEMENTED am: da09f4abca am: 0db8b90cdb am: 231770e40c am: c171cefa91 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12036417

Change-Id: Ibabb0adea542229c90afcbfc59dca0a37ad89588
 2020-07-07 00:35:51 +00:00
Robert Shih
2ac3a6b623 GetDecryptHashSupport: recognize OEMCrypto_ERROR_NOT_IMPLEMENTED am: da09f4abca am: 0db8b90cdb am: 2009155f7e am: deb11efb5f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12036417

Change-Id: I6df47d941ecea3ad046c90f19bd355767d0e15ab
 2020-07-07 00:34:36 +00:00
Robert Shih
ba2e3e41f8 GetDecryptHashSupport: recognize OEMCrypto_ERROR_NOT_IMPLEMENTED am: da09f4abca am: f240709ef2 am: 918dba59f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12036417

Change-Id: Ibb4706058e19d68706ba0fa011554ba2330e8c0e
 2020-07-07 00:20:41 +00:00
Robert Shih
c171cefa91 GetDecryptHashSupport: recognize OEMCrypto_ERROR_NOT_IMPLEMENTED am: da09f4abca am: 0db8b90cdb am: 231770e40c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12036417

Change-Id: I72e461c36bf48714648e04b256885d5948a724dc
 2020-07-07 00:20:18 +00:00
Robert Shih
deb11efb5f GetDecryptHashSupport: recognize OEMCrypto_ERROR_NOT_IMPLEMENTED am: da09f4abca am: 0db8b90cdb am: 2009155f7e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12036417

Change-Id: I841154f06f33f926d56dde9e25bb3bf45efad7b6
 2020-07-07 00:19:54 +00:00
Robert Shih
231770e40c GetDecryptHashSupport: recognize OEMCrypto_ERROR_NOT_IMPLEMENTED am: da09f4abca am: 0db8b90cdb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12036417

Change-Id: I94c1340571cffbe834c8ea2576008665d61c08c0
 2020-07-06 23:58:19 +00:00
Robert Shih
918dba59f1 GetDecryptHashSupport: recognize OEMCrypto_ERROR_NOT_IMPLEMENTED am: da09f4abca am: f240709ef2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12036417

Change-Id: Ic83b03effbc60ba595e83b6348d4abd451b269eb
 2020-07-06 23:57:56 +00:00
Robert Shih
2009155f7e GetDecryptHashSupport: recognize OEMCrypto_ERROR_NOT_IMPLEMENTED am: da09f4abca am: 0db8b90cdb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12036417

Change-Id: I10bc5ae45c8f20f0a9b2349c6fa01b8aae0664ae
 2020-07-06 23:57:44 +00:00
Robert Shih
f240709ef2 GetDecryptHashSupport: recognize OEMCrypto_ERROR_NOT_IMPLEMENTED am: da09f4abca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12036417

Change-Id: Ifb1122df9b6098e0d7ce51a7522249693fe40fee
 2020-07-06 23:40:18 +00:00
Robert Shih
0db8b90cdb GetDecryptHashSupport: recognize OEMCrypto_ERROR_NOT_IMPLEMENTED am: da09f4abca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12036417

Change-Id: Icc0b7bb24c4058de5786fc7e28a50bbc2aee5f4b
 2020-07-06 23:39:43 +00:00
Robert Shih
da09f4abca GetDecryptHashSupport: recognize OEMCrypto_ERROR_NOT_IMPLEMENTED 
[ Merge of http://go/wvgerrit/102383 ]

Bug: 153297118
Bug: 160182693
Test: MediaDrmTest#testDecryptHashError
Change-Id: I107668cdd1ab0acda717f184496e569a4f9a8653
 2020-06-29 22:19:26 +00:00
android-build-team Robot
43055d5bdf Snap for 6635466 from 37b8b51a22 to sc-release 
Change-Id: I215f935940b6d9b8a57a6af1b931fce62f74c556
 2020-06-27 23:02:00 +00:00
Bob Badour
37b8b51a22 Merge "Add METADATA to widevine: widevine=BY_EXCEPTION_ONLY" 2020-06-27 06:54:13 +00:00
Bob Badour
64e02683a0 Add METADATA to widevine: widevine=BY_EXCEPTION_ONLY 
Bug: 68860345
Bug: 69058154
Bug: 151953481

Test: no code changes

Exempt-From-Owner-Approval: janitorial work
Change-Id: I12e27639e18505ebd3c817fc3c6587203024bc71
 2020-06-26 12:29:20 -07:00