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

3242 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rahul Frias
d8f86965e3 [automerger skipped] Merge "Merge "Address request license test failures [ DO NOT MERGE ]" into qt-dev am: 367befa3b7 am: ba5a1aac05" into qt-r1-dev-plus-aosp 
am: b280f8c717 -s ours
am skip reason: subject contains skip directive

Change-Id: I93125b792cabe4dfbca9a122ffc0da48ce5d2dd1
 2019-06-01 18:20:46 -07:00
Rahul Frias
15f5c99494 [automerger skipped] Merge "Address request license test failures [ DO NOT MERGE ]" into qt-dev am: 367befa3b7 am: 3a92c08fa2 
am: 1a7a1b8df8 -s ours
am skip reason: subject contains skip directive

Change-Id: I8d6d4c23e5dff6b3b8871a5f069da0c688aa6369
 2019-06-01 18:20:32 -07:00
Rahul Frias
78ac369748 [automerger skipped] Merge "Address request license test failures [ DO NOT MERGE ] am: b7c6f9b52c am: 11bc2924ab" into qt-r1-dev-plus-aosp 
am: a998158cd2 -s ours
am skip reason: subject contains skip directive

Change-Id: I65ee3aceeadf2b1f3cb1af09ca5e2efa79c6ecf1
 2019-06-01 18:20:15 -07:00
Rahul Frias
e5f7001bff [automerger skipped] Address request license test failures [ DO NOT MERGE ] am: b7c6f9b52c am: 1d05cf8e0d 
am: 74d7819374 -s ours
am skip reason: subject contains skip directive

Change-Id: I1a61159696d649f90e2775a6669ca7aadb6a8033
 2019-06-01 18:19:57 -07:00
Android Build Merger (Role)
b280f8c717 Merge "Merge "Address request license test failures [ DO NOT MERGE ]" into qt-dev am: 367befa3b7 am: ba5a1aac05" into qt-r1-dev-plus-aosp 2019-06-02 01:14:16 +00:00
Rahul Frias
33b056663b Merge "Address request license test failures [ DO NOT MERGE ]" into qt-dev am: 367befa3b7 
am: ba5a1aac05

Change-Id: I3502e69a3afa5f47354a1537dbacb5787607d2d1
 2019-06-01 18:14:02 -07:00
Rahul Frias
1a7a1b8df8 Merge "Address request license test failures [ DO NOT MERGE ]" into qt-dev am: 367befa3b7 
am: 3a92c08fa2

Change-Id: I58109d2c39b28f98e643dc5c35096ca93c363292
 2019-06-01 18:14:00 -07:00
Android Build Merger (Role)
a998158cd2 Merge "Address request license test failures [ DO NOT MERGE ] am: b7c6f9b52c am: 11bc2924ab" into qt-r1-dev-plus-aosp 2019-06-02 01:13:56 +00:00
Rahul Frias
74d7819374 Address request license test failures [ DO NOT MERGE ] am: b7c6f9b52c 
am: 1d05cf8e0d

Change-Id: Ia534ee9e981f2d6ea4acb23a41e433baed071c8f
 2019-06-01 18:13:45 -07:00
Rahul Frias
d91d17e538 Address request license test failures [ DO NOT MERGE ] am: b7c6f9b52c 
am: 11bc2924ab

Change-Id: Id2d0f8e4e394b1a8fbe602258a410647f491431b
 2019-06-01 18:13:45 -07:00
Rahul Frias
ba5a1aac05 Merge "Address request license test failures [ DO NOT MERGE ]" into qt-dev 
am: 367befa3b7

Change-Id: Ie2171e229bcf73a2672377f43d4d0f4c5ca7bb59
 2019-06-01 17:56:56 -07:00
Rahul Frias
3a92c08fa2 Merge "Address request license test failures [ DO NOT MERGE ]" into qt-dev 
am: 367befa3b7

Change-Id: I9b249c267aaaeb0272e1952415f85b00f68532cc
 2019-06-01 17:56:56 -07:00
Rahul Frias
1d05cf8e0d Address request license test failures [ DO NOT MERGE ] 
am: b7c6f9b52c

Change-Id: Id3616ea5bae789c2cdb2135cfdb92495c69536e0
 2019-06-01 17:56:55 -07:00
Rahul Frias
11bc2924ab Address request license test failures [ DO NOT MERGE ] 
am: b7c6f9b52c

Change-Id: Ica7bf215979ae75b5ebdec4ba881ac6cba13a9bd
 2019-06-01 17:56:55 -07:00
Rahul Frias
367befa3b7 Merge "Address request license test failures [ DO NOT MERGE ]" into qt-dev 2019-06-02 00:44:31 +00:00
Rahul Frias
643c574775 Merge "Return key request type none after key rotation" into qt-dev am: 999a466275 am: 4c5cba3597 
am: d65500fe7f

Change-Id: Id153ac8c57873ccdc60fe76e6ade470c289a2a11
 2019-05-31 09:59:15 -07:00
Rahul Frias
6c9c4697f0 Merge "Return key request type none after key rotation" into qt-dev am: 999a466275 am: 4690da2bcb 
am: 4c9a3a6f02

Change-Id: Iddcac699401f64d920fcb8ff73053410019ec028
 2019-05-31 09:55:31 -07:00
Rahul Frias
d65500fe7f Merge "Return key request type none after key rotation" into qt-dev am: 999a466275 
am: 4c5cba3597

Change-Id: I0d5a4042154e42e40595fdb3b1d17448e56c3e52
 2019-05-31 09:38:25 -07:00
Rahul Frias
4c9a3a6f02 Merge "Return key request type none after key rotation" into qt-dev am: 999a466275 
am: 4690da2bcb

Change-Id: I45387edbb83f05dcadec53e4514cb97c68eae6c7
 2019-05-31 09:33:36 -07:00
Rahul Frias
4c5cba3597 Merge "Return key request type none after key rotation" into qt-dev 
am: 999a466275

Change-Id: Ic1546795d145988181e2a8eb6663a0b906b2617d
 2019-05-31 09:17:27 -07:00
Rahul Frias
4690da2bcb Merge "Return key request type none after key rotation" into qt-dev 
am: 999a466275

Change-Id: Ia0a19cf34deac3714ae35ff698dffce4d00ef616
 2019-05-31 09:16:52 -07:00
Rahul Frias
999a466275 Merge "Return key request type none after key rotation" into qt-dev 2019-05-31 15:55:05 +00:00
Rahul Frias
ecf8a96970 Merge "Merge "WvCdmExtendedDurationTest#VerifyLicenseRequestTest fixes" into qt-dev am: e4d432806a am: bb4ffe8bdb" into qt-r1-dev-plus-aosp 
am: 22c06c5773

Change-Id: I925c6255010718e586410d50493b071326aaf005
 2019-05-29 19:31:15 -07:00
Rahul Frias
b271da5139 Merge "WvCdmExtendedDurationTest#VerifyLicenseRequestTest fixes" into qt-dev am: e4d432806a am: 785cd12f3c 
am: 09e2b6dfa6

Change-Id: I5b1757fee7311a2d34ea5299ec900421dc160634
 2019-05-29 19:30:56 -07:00
Android Build Merger (Role)
22c06c5773 Merge "Merge "WvCdmExtendedDurationTest#VerifyLicenseRequestTest fixes" into qt-dev am: e4d432806a am: bb4ffe8bdb" into qt-r1-dev-plus-aosp 2019-05-30 02:24:43 +00:00
Rahul Frias
09e2b6dfa6 Merge "WvCdmExtendedDurationTest#VerifyLicenseRequestTest fixes" into qt-dev am: e4d432806a 
am: 785cd12f3c

Change-Id: Ic2853252157390f93d2c6cc9406361feb7696d99
 2019-05-29 19:24:33 -07:00
Rahul Frias
fa5aa2f616 Merge "WvCdmExtendedDurationTest#VerifyLicenseRequestTest fixes" into qt-dev am: e4d432806a 
am: bb4ffe8bdb

Change-Id: Idabc26501d3cbe249bff63bb1123163e20022027
 2019-05-29 19:24:32 -07:00
Rahul Frias
bb4ffe8bdb Merge "WvCdmExtendedDurationTest#VerifyLicenseRequestTest fixes" into qt-dev 
am: e4d432806a

Change-Id: I8a14eb075baba43f330e683c2acd021a304662de
 2019-05-29 19:19:33 -07:00
Rahul Frias
785cd12f3c Merge "WvCdmExtendedDurationTest#VerifyLicenseRequestTest fixes" into qt-dev 
am: e4d432806a

Change-Id: Ic326baeba34037e4c34e3c06717fc5fd901e01f1
 2019-05-29 19:19:33 -07:00
Rahul Frias
e4d432806a Merge "WvCdmExtendedDurationTest#VerifyLicenseRequestTest fixes" into qt-dev 2019-05-30 02:06:42 +00:00
Rahul Frias
b7c6f9b52c Address request license test failures [ DO NOT MERGE ] 
[ Merge of http://go/wvgerrit/79883 ]

This corrects test code and undoes CE CDM changes in b/113167010 which
will be resolved in a future release.

The tests failures addressed are
* ProvisioningTestWithServiceCertificate
* ReleaseRetryOfflineKeyTest
* ReleaseRetryL3OfflineKeyTest
* ReleaseRetryL3OfflineKeySessionUsageDisable

ProvisioningInterspersedRetryTest has been disabled and will be
addressed in a post 15.2 OEMCrypto release in 133641240

Bug: 119428680
Test: WV unit/integration tests
Change-Id: I7961b4556a0ac749e4f38d43f1bea8f520d67f20
 2019-05-29 19:04:52 -07:00
Rahul Frias
3c9175fec5 Return key request type none after key rotation 
[ Merge of http://go/wvgerrit/80084 ]

Corrected the key type being returned after entitled keys from
init data are loaded. Made test changes to validate.

Bug: 133903028
Test: WV unit/integration tests
Change-Id: Icb44587f5c3aba3b0facae6d83dc9344d6b60833
 2019-05-29 19:03:43 -07:00
Srujan Gaddam
1479632fa7 Merge "Change move_widevine_data.sh to move L3 files" into qt-dev am: f246f028b2 am: 5f5cc2b634 
am: 670804fb8b

Change-Id: I72e1c3e113b6470711ae99b0cfa928f2c1b53387
 2019-05-25 11:15:00 -07:00
Srujan Gaddam
1423b9261f Merge "Change move_widevine_data.sh to move L3 files" into qt-dev am: f246f028b2 am: c9ba0981ba 
am: b4396d0e6e

Change-Id: I2549d67295dc4bb9599a951ea6ed9d8f99048d67
 2019-05-25 10:58:02 -07:00
Srujan Gaddam
18e3cf144a Reverse LD_LIBRARY_PATH order based on liboemcrypto.so am: 45d02c545c am: 4f63000ad7 
am: e7ed590fe2

Change-Id: Iee0fcdd19542b0068707928530131c686ac57859
 2019-05-25 10:40:17 -07:00
Srujan Gaddam
670804fb8b Merge "Change move_widevine_data.sh to move L3 files" into qt-dev am: f246f028b2 
am: 5f5cc2b634

Change-Id: Ib88a498287b245c059d1a89f0b9823705ce0bcb9
 2019-05-25 10:35:07 -07:00
Srujan Gaddam
28696a2125 Reverse LD_LIBRARY_PATH order based on liboemcrypto.so am: 45d02c545c am: 61510bbc8a 
am: 971aa7d2d4

Change-Id: I96e5f4358ef37ec1dce634b021fd64f24ed7a77e
 2019-05-25 10:34:07 -07:00
Srujan Gaddam
b4396d0e6e Merge "Change move_widevine_data.sh to move L3 files" into qt-dev am: f246f028b2 
am: c9ba0981ba

Change-Id: Ibfc8e5b6f4065ed423e7a5aa46ad646f9314b50e
 2019-05-25 10:23:53 -07:00
Srujan Gaddam
e7ed590fe2 Reverse LD_LIBRARY_PATH order based on liboemcrypto.so am: 45d02c545c 
am: 4f63000ad7

Change-Id: Ie44be8d202f8a560a3cb696526ffc5cb3a3e3a06
 2019-05-25 10:12:00 -07:00
Srujan Gaddam
971aa7d2d4 Reverse LD_LIBRARY_PATH order based on liboemcrypto.so am: 45d02c545c 
am: 61510bbc8a

Change-Id: I06f61b27bbeae84f1fbc5a8f260612aa935bfb72
 2019-05-25 10:10:31 -07:00
Srujan Gaddam
c9ba0981ba Merge "Change move_widevine_data.sh to move L3 files" into qt-dev 
am: f246f028b2

Change-Id: If234e0936bb67da65a60cf724792bdea97d3fae9
 2019-05-25 10:05:10 -07:00
Srujan Gaddam
61510bbc8a Reverse LD_LIBRARY_PATH order based on liboemcrypto.so 
am: 45d02c545c

Change-Id: I792d5690d8a635338a844addc4bd4ad3ef469cb1
 2019-05-25 09:58:50 -07:00
Haibo Huang
1d2ee2d4d7 Merge "Using ::testing::DoAll" into qt-dev-plus-aosp am: f078443fd7 
am: 0222e219f6

Change-Id: I1a97f8acee8895833793faf271e216dcdbf1a5d3
 2019-05-24 20:23:12 -07:00
Srujan Gaddam
5f5cc2b634 Merge "Change move_widevine_data.sh to move L3 files" into qt-dev 
am: f246f028b2

Change-Id: Ie11b5cab53bc0eae5259adea637c844db836c045
 2019-05-24 14:18:22 -07:00
TreeHugger Robot
f246f028b2 Merge "Change move_widevine_data.sh to move L3 files" into qt-dev 2019-05-24 20:59:31 +00:00
Srujan Gaddam
4f63000ad7 Reverse LD_LIBRARY_PATH order based on liboemcrypto.so 
am: 45d02c545c

Change-Id: I2e28abef3400773443df0bbb0f6392663bbd93a6
 2019-05-24 12:28:52 -07:00
Srujan Gaddam
45d02c545c Reverse LD_LIBRARY_PATH order based on liboemcrypto.so 
Bug: b/133427576
Test: Unit tests on Taimen and Crosshatch
Merge of http://go/wvgerrit/79804

Currently, the run_all_unit_tests.sh script fails to load in the Level 1
OEMCrypto for some devices that don't have a 64-bit liboemcrypto.so. This
is because the liboemcrypto.so tries to load in libQSEEComAPI.so, which
some devices contain both a 32-bit and 64-bit version of. Since we set
the LD_LIBRARY_PATH to use /vendor/lib64 first, and since we only have a
32-bit liboemcrypto.so, the 32-bit liboemcrypto.so will try to load in the
libQSEEComAPI.so in the lib64 path first. Since the liboemcrypto.so is
32-bit, it will fail to open the 64-bit library. The solution to this is
to conditionally set the LD_LIBRARY_PATH based on if a 64-bit
liboemcrypto.so exists or not.

Change-Id: I80a9e778f31f089f66df0544cb022d810e9d3de3
 2019-05-24 10:30:10 -07:00
Haibo Huang
6f1910ec4c Using ::testing::DoAll am: c70771dd20 
am: 1fd42b9c8c

Change-Id: If13da61f0d4c34bbe41b352573409cd4a349b575
 2019-05-23 01:31:59 -07:00
Rahul Frias
80b8e29c3f WvCdmExtendedDurationTest#VerifyLicenseRequestTest fixes 
[ Merge of http://go/wvgerrit/79724 ]

Bug: 122982573
Test: WV unit/integration tests
Change-Id: Icb7b192311dc6bbe630d96f993ccca774160774b
 2019-05-22 18:12:06 -07:00
Haibo Huang
0222e219f6 Merge "Using ::testing::DoAll" into qt-dev-plus-aosp 
am: f078443fd7

Change-Id: If82da95f95f0338aeba25107c213c25dca999153
 2019-05-22 14:04:28 -07:00