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

5007 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
84b3472919 GetDecryptHashSupport: recognize OEMCrypto_ERROR_NOT_IMPLEMENTED am: da09f4abca am: f240709ef2 am: 918dba59f1 am: ba2e3e41f8 am: 1cd67ca8f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12036417

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

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

Change-Id: I2e517198a0645452bc88177b6a0efe9ee449d4f7
 2020-07-07 00:50:25 +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
4bf604c2d7 GetDecryptHashSupport: recognize OEMCrypto_ERROR_NOT_IMPLEMENTED am: da09f4abca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12036417

Change-Id: I4d3fface97c7d94b82a589dded50cf7081078249
 2020-07-06 23:40:02 +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
b40905af97 Merge "Add METADATA to widevine: widevine=BY_EXCEPTION_ONLY" am: 37b8b51a22 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12014468

Change-Id: I187189432f603a8e6008b228b708bbe77700c04d
 2020-06-27 07:07:37 +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
android-build-team Robot
857b68559e Snap for 6630042 from 38a8b631be to sc-release 
Change-Id: I863dfd12d9bce298812b82745279753862dd3862
 2020-06-26 02:09:39 +00:00
John Bruce
ddef4989ef Merge "Rework Device File Matchers to Avoid Buffer Overflow" am: 38a8b631be 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11991134

Change-Id: Ica5664d56a0f47e37aabe1e202e2f94fc31b93ff
 2020-06-25 22:15:06 +00:00
John Bruce
38a8b631be Merge "Rework Device File Matchers to Avoid Buffer Overflow" 2020-06-25 21:58:58 +00:00
Alex Dale
dc11ccdaa2 Merge "Test CDM sessions prevent multiple usage entries." into rvc-dev am: c628c5aca2 am: 3adda0dfe1 am: b535120ccd am: 65211cab08 am: 62b95b4b54 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11925460

Change-Id: I387f11c694163ebea67621aa49e44f77b85825ce
 2020-06-25 20:40:19 +00:00
Alex Dale
790dd51fc8 Merge "Test CDM sessions prevent multiple usage entries." into rvc-dev am: c628c5aca2 am: 62462f4ec5 am: 8453477daa am: a5e30b73a3 am: 03dfb757c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11925460

Change-Id: I0fb545fe87b33e49b50e0008e87f24232894f77e
 2020-06-25 20:40:09 +00:00
Alex Dale
0923d1fd27 Merge "Test CDM sessions prevent multiple usage entries." into rvc-dev am: c628c5aca2 am: 3adda0dfe1 am: 52901002a1 am: 33c3fd9085 am: 88fba96dfb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11925460

Change-Id: I361346a7020d12df7544060cc2d2fb93570cffb0
 2020-06-25 20:40:03 +00:00
Alex Dale
62b95b4b54 Merge "Test CDM sessions prevent multiple usage entries." into rvc-dev am: c628c5aca2 am: 3adda0dfe1 am: b535120ccd am: 65211cab08 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11925460

Change-Id: I71c97cc16dcb10a4c90551f625663714e000e886
 2020-06-25 20:27:59 +00:00
Alex Dale
03dfb757c4 Merge "Test CDM sessions prevent multiple usage entries." into rvc-dev am: c628c5aca2 am: 62462f4ec5 am: 8453477daa am: a5e30b73a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11925460

Change-Id: I382d70815918a739dd5e7f4de14d44c007baadbf
 2020-06-25 20:27:50 +00:00
Alex Dale
88fba96dfb Merge "Test CDM sessions prevent multiple usage entries." into rvc-dev am: c628c5aca2 am: 3adda0dfe1 am: 52901002a1 am: 33c3fd9085 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11925460

Change-Id: I224f1e42089548e2e78318df4c67e650253fde6d
 2020-06-25 20:27:27 +00:00
Alex Dale
65211cab08 Merge "Test CDM sessions prevent multiple usage entries." into rvc-dev am: c628c5aca2 am: 3adda0dfe1 am: b535120ccd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11925460

Change-Id: I5b906c594c1c3292bdc5aaa20c2071ae56d912a6
 2020-06-25 20:03:15 +00:00
Alex Dale
a5e30b73a3 Merge "Test CDM sessions prevent multiple usage entries." into rvc-dev am: c628c5aca2 am: 62462f4ec5 am: 8453477daa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11925460

Change-Id: Ic6505cf29342b745a3dfed0047d1e8503b6c6f38
 2020-06-25 20:03:02 +00:00
Alex Dale
33c3fd9085 Merge "Test CDM sessions prevent multiple usage entries." into rvc-dev am: c628c5aca2 am: 3adda0dfe1 am: 52901002a1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11925460

Change-Id: I4091326a55cc8cb514971b2ea595b10e12f38294
 2020-06-25 20:02:55 +00:00
Alex Dale
8453477daa Merge "Test CDM sessions prevent multiple usage entries." into rvc-dev am: c628c5aca2 am: 62462f4ec5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11925460

Change-Id: I46c0b2e57cedfdac19b622c9191e604c05301eeb
 2020-06-25 19:50:16 +00:00
Alex Dale
b535120ccd Merge "Test CDM sessions prevent multiple usage entries." into rvc-dev am: c628c5aca2 am: 3adda0dfe1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11925460

Change-Id: I2bf4c438575cb22bd350bb9c364a2543f04423d3
 2020-06-25 19:50:04 +00:00
Alex Dale
52901002a1 Merge "Test CDM sessions prevent multiple usage entries." into rvc-dev am: c628c5aca2 am: 3adda0dfe1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11925460

Change-Id: I2c3237138f100970ab62dddb377122a980a211f1
 2020-06-25 19:50:03 +00:00
Alex Dale
3adda0dfe1 Merge "Test CDM sessions prevent multiple usage entries." into rvc-dev am: c628c5aca2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11925460

Change-Id: Ia63d263ae89bc14836704f1dc2d95f5b06590754
 2020-06-25 19:39:21 +00:00
Alex Dale
7a65b6c2d4 Merge "Test CDM sessions prevent multiple usage entries." into rvc-dev am: c628c5aca2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11925460

Change-Id: I878a03a99218ef19edd6955adf1184a6b35bb07a
 2020-06-25 19:38:34 +00:00
Alex Dale
62462f4ec5 Merge "Test CDM sessions prevent multiple usage entries." into rvc-dev am: c628c5aca2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11925460

Change-Id: I9d6813c4a20dbc679c1526f73dc1be5593d2fee5
 2020-06-25 19:38:17 +00:00
Alex Dale
c628c5aca2 Merge "Test CDM sessions prevent multiple usage entries." into rvc-dev 2020-06-25 19:25:18 +00:00
Alex Dale
be9aa78d3e INSUFFICIENT_RESOURCE errors are mapped consistently. am: 6a247ab924 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11956161

Change-Id: I25a403be5994ceb29b15b6d6c53d8f02db2d3bd2
 2020-06-25 02:06:54 +00:00