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
2019-06-01 18:13:45 -07:00
Rahul Frias
d91d17e538
Address request license test failures [ DO NOT MERGE ] am: b7c6f9b52c
...
am: 11bc2924ab
2019-06-01 18:13:45 -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
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
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
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
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
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
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
Android Build Merger (Role)
5cbcb9eba0
Merge "Merge "Correct android version number in test" into qt-dev am: 48650f74ab am: df19f4f85d" into qt-r1-dev-plus-aosp
2019-05-17 14:41:31 +00:00
Rahul Frias
ed587da19c
Merge "Correct android version number in test" into qt-dev am: 48650f74ab
...
am: df19f4f85d
2019-05-17 07:41:23 -07:00
Rahul Frias
766a15693a
Merge "Correct android version number in test" into qt-dev am: 48650f74ab
...
am: 5b3a43b17c
2019-05-17 07:41:18 -07:00
Rahul Frias
5b3a43b17c
Merge "Correct android version number in test" into qt-dev
...
am: 48650f74ab
2019-05-17 07:38:18 -07:00
Rahul Frias
df19f4f85d
Merge "Correct android version number in test" into qt-dev
...
am: 48650f74ab
2019-05-17 07:36:16 -07:00
Rahul Frias
48650f74ab
Merge "Correct android version number in test" into qt-dev
2019-05-17 14:23:01 +00:00
Fred Gylys-Colwell
b85766a7f0
Merge "Disable failures for LoadKeyWithSuspiciousIV and SelectKeyNotThereAPI15" into qt-dev am: 3454ccf51e
...
am: af4ba75658
2019-05-16 17:45:51 -07:00
Fred Gylys-Colwell
5a9ef9a128
Merge "Disable failures for LoadKeyWithSuspiciousIV and SelectKeyNotThereAPI15" into qt-dev am: 3454ccf51e
...
am: d579bbf511
2019-05-16 17:23:18 -07:00
Fred Gylys-Colwell
af4ba75658
Merge "Disable failures for LoadKeyWithSuspiciousIV and SelectKeyNotThereAPI15" into qt-dev
...
am: 3454ccf51e
2019-05-16 15:43:59 -07:00
Fred Gylys-Colwell
d579bbf511
Merge "Disable failures for LoadKeyWithSuspiciousIV and SelectKeyNotThereAPI15" into qt-dev
...
am: 3454ccf51e
2019-05-16 15:34:06 -07:00
Rahul Frias
4f273991b9
Correct android version number in test
...
[ Merge of http://go/wvgerrit/79144 ]
Bug: 132908020
Test: WV unit/integration tests
Change-Id: Idf5cf3e1e886af3bfed157320fa09d66dfa55c0d
2019-05-16 14:44:40 -07:00
TreeHugger Robot
3454ccf51e
Merge "Disable failures for LoadKeyWithSuspiciousIV and SelectKeyNotThereAPI15" into qt-dev
2019-05-16 20:34:18 +00:00
Srujan Gaddam
189eb87977
Change move_widevine_data.sh to move L3 files
...
Bug: b/130252305
Test: nyc-mr2-release -> pi-dev, oc-mr1-release -> pi-dev
nyc-mr2-release -> oc-mr1-release -> pi-dev upgrades with offline
licenses
Merge of http://go/ag/7323341
In N, the L3 files were stored in /data/mediadrm/IDM[uid]/. In O, they
were moved to /data/mediadrm/IDM[uid]/L3/. In P, we moved the contents
of mediadrm to /data/vendor/mediadrm/. For an O->P upgrade, the L3 files
can be read in /data/vendor/mediadrm/IDM[uid]/L3/, but when we upgrade
N->P, the L3 files sit in /data/vendor/mediadrm/IDM[uid]/, unable to be
read. This CL addresses this issue by changing the script to move any L3
files if they exist under this directory to the L3 subdirectory after we
do the bulk move from /data/mediadrm/ to /data/vendor/mediadrm/.
Change-Id: I319c323879766df063d25478046367878023a7cf
(cherry picked from commit 1a6ca36976
2019-05-16 20:25:54 +00:00
Robert Shih
e91e7142ae
Add CdmKeyStatus kKeyStatusUsableInFuture am: 69c8f488ca
...
am: 790b97e308
2019-05-16 07:15:25 -07:00
Robert Shih
e6ba3ec747
Add CdmKeyStatus kKeyStatusUsableInFuture am: 69c8f488ca
...
am: 6a329e6c9a
2019-05-15 22:41:49 -07:00
Robert Shih
790b97e308
Add CdmKeyStatus kKeyStatusUsableInFuture
...
am: 69c8f488ca
2019-05-15 18:32:40 -07:00
