Rahul Frias
ba5a1aac05
Merge "Address request license test failures [ DO NOT MERGE ]" into qt-dev
...
am: 367befa3b7
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
2019-06-01 17:56:56 -07:00
Rahul Frias
1d05cf8e0d
Address request license test failures [ DO NOT MERGE ]
...
am: b7c6f9b52c
2019-06-01 17:56:55 -07:00
Rahul Frias
11bc2924ab
Address request license test failures [ DO NOT MERGE ]
...
am: b7c6f9b52c
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
John W. Bruce
1d5b7cc8fe
Take a Global Write Lock Before Calling OEMCrypto_GenerateNonce()
...
(This is a merge of http://go/wvgerrit/77803 )
In OEMCrypto 15.2, OEMCrypto_GenerateNonce() is a Session Initialization
Function, which means the global OEMCrypto lock must be held before
calling it. There's no harm updating our code to behave this way now,
even before OEMCrypto 15.2 implementations are ready, since it's a
stricter guarantee than the current behavior.
Bug: 131327826
Test: CE CDM Unit Tests
Test: Android Unit Tests
Change-Id: Icb6a86dea7298c99596fa9e3d90cec721ebcb8a6
2019-05-31 19:02:29 -07:00
Rahul Frias
643c574775
Merge "Return key request type none after key rotation" into qt-dev am: 999a466275 am: 4c5cba3597
...
am: d65500fe7f
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
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
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
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
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
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
2019-05-29 19:31:15 -07:00
Rahul Frias
b271da5139
Merge "WvCdmExtendedDurationTest#VerifyLicenseRequestTest fixes" into qt-dev am: e4d432806a am: 785cd12f3c
...
am: 09e2b6dfa6
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
2019-05-29 19:24:33 -07:00
Rahul Frias
fa5aa2f616
Merge "WvCdmExtendedDurationTest#VerifyLicenseRequestTest fixes" into qt-dev am: e4d432806a
...
am: bb4ffe8bdb
2019-05-29 19:24:32 -07:00
Rahul Frias
bb4ffe8bdb
Merge "WvCdmExtendedDurationTest#VerifyLicenseRequestTest fixes" into qt-dev
...
am: e4d432806a
2019-05-29 19:19:33 -07:00
Rahul Frias
785cd12f3c
Merge "WvCdmExtendedDurationTest#VerifyLicenseRequestTest fixes" into qt-dev
...
am: e4d432806a
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
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
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
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
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
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
2019-05-25 10:23:53 -07:00
Srujan Gaddam
e7ed590fe2
Reverse LD_LIBRARY_PATH order based on liboemcrypto.so am: 45d02c545c
...
am: 4f63000ad7
2019-05-25 10:12:00 -07:00
Srujan Gaddam
971aa7d2d4
Reverse LD_LIBRARY_PATH order based on liboemcrypto.so am: 45d02c545c
...
am: 61510bbc8a
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
2019-05-25 10:05:10 -07:00
Srujan Gaddam
61510bbc8a
Reverse LD_LIBRARY_PATH order based on liboemcrypto.so
...
am: 45d02c545c
2019-05-25 09:58:50 -07:00
Haibo Huang
1d2ee2d4d7
Merge "Using ::testing::DoAll" into qt-dev-plus-aosp am: f078443fd7
...
am: 0222e219f6
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
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
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
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
2019-05-22 14:04:28 -07:00
Haibo Huang
1fd42b9c8c
Using ::testing::DoAll
...
am: c70771dd20
2019-05-22 13:26:49 -07:00
Haibo Huang
f078443fd7
Merge "Using ::testing::DoAll" into qt-dev-plus-aosp
2019-05-22 17:43:01 +00:00
Haibo Huang
e3e086e3f8
Using ::testing::DoAll
...
Without this statement, compilation failed with new googletest.
Test: build
Bug: 129498355
Change-Id: I9eb7b7a2634f20ef80a23b75c06fc84a2fa52dc3
(cherry picked from commit 9055e93a70
2019-05-22 17:38:58 +00:00
Haibo Huang
c70771dd20
Using ::testing::DoAll
...
[ Merge of ag/7620084 ]
Without this statement, compilation failed with new googletest.
Test: build
Bug: 129498355
Change-Id: I5e3f5310617e00821f70079fc700bc3f87c3d0ab
(cherry picked from commit 5764d3f801
2019-05-22 17:27:03 +00:00
Rahul Frias
9900ce909b
Merge "Ref count WvCdmDecryptionModule"
2019-05-22 14:28:02 +00:00
Fred Gylys-Colwell
aa7f7d3ac4
Remove test keybox one more time
...
Merge from Widevine repo of http://go/wvgerrit/78883
Bug: 119316243
Test: unit tests
Change-Id: Ic6748a6e020c2a4058510fb5c6c5a821e57cc5fd
2019-05-22 00:25:56 +00:00
Rahul Frias
776996d6d2
Ref count WvCdmDecryptionModule
...
[ Merge of http://go/wvgerrit/78803 ]
WvCdmDecryptionModule needs to be refcounted since it inherits
from RefBase. The test code instantiates it as a member variable.
Bug: 133188706
Test: WV unit/integration tests
Change-Id: Ib41f3477a55923fb4cc26472e42d3e18eb2b84d4
2019-05-21 11:41:52 -07:00
Haibo Huang
5764d3f801
Using ::testing::DoAll
...
Without this statement, compilation failed with new googletest.
Test: build
Bug: 129498355
Change-Id: I5e3f5310617e00821f70079fc700bc3f87c3d0ab
2019-05-20 11:19:06 -07:00
Haibo Huang
c19f8867c0
Merge "Using ::testing::DoAll"
2019-05-20 00:19:13 +00:00
