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
61510bbc8a
Reverse LD_LIBRARY_PATH order based on liboemcrypto.so
...
am: 45d02c545c
2019-05-25 09:58:50 -07: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
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
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
Robert Shih
6a329e6c9a
Add CdmKeyStatus kKeyStatusUsableInFuture
...
am: 69c8f488ca
2019-05-15 18:32:20 -07:00
Robert Shih
69c8f488ca
Add CdmKeyStatus kKeyStatusUsableInFuture
...
Bug: 116738851
Test: unit tests
Change-Id: I49728788e57905806b72e891f3654fbf0c8b1bc0
2019-05-15 15:16:05 -07:00
Fred Gylys-Colwell
29becbc2bf
Disable failures for LoadKeyWithSuspiciousIV and SelectKeyNotThereAPI15
...
Merge from Widevine repo of http://go/wvgerrit/78949
LoadKeyWithSuspiciousIV is a new test for OEMCrypto v15.2. It is
being disabled since we do not require 15.2 for the Q release.
SelectKeyNotThereAPI15 was failing because the error code is
delayed. This is acceptable.
Bug: 132720732
Test: unit tests on taimen
Change-Id: Iea3fabfb3afd800065119ce812fb454be1e82644
2019-05-14 22:32:54 -07:00
Fred Gylys-Colwell
770212b178
Merge "Fix OEMCrypto UsageTableTest.GenerateReportWrongPST" into qt-dev
...
am: 127f87770c
2019-05-14 15:29:54 -07:00
TreeHugger Robot
127f87770c
Merge "Fix OEMCrypto UsageTableTest.GenerateReportWrongPST" into qt-dev
2019-05-14 22:01:11 +00:00
Rahul Frias
389d917e88
Merge "Ref count Timer implementation" into qt-dev
...
am: ed833222a6
2019-05-13 13:57:13 -07:00
Rahul Frias
ed833222a6
Merge "Ref count Timer implementation" into qt-dev
2019-05-13 20:24:45 +00:00
Rahul Frias
f13e62fbe3
Merge "Single PSSH entitlement handling" into qt-dev
...
am: 19c6e57269
2019-05-13 09:45:01 -07:00
Rahul Frias
555d7cdc83
Merge "Key Status should reflect key container security level" into qt-dev
...
am: 80f5e283ad
2019-05-13 09:44:39 -07:00
Rahul Frias
19c6e57269
Merge "Single PSSH entitlement handling" into qt-dev
2019-05-13 16:26:16 +00:00
Rahul Frias
80f5e283ad
Merge "Key Status should reflect key container security level" into qt-dev
2019-05-13 16:25:24 +00:00
Rahul Frias
4d917e3ee8
Ref count Timer implementation
...
[ Merge of http://go/wvgerrit/78763 ]
The android timer instance is held by a regular pointer rather
than reference counted as all classes that derive from RefBase
should be. This could result in a double deallocation, if the
timer is ever passed to a strong pointer.
Bug: 79364026
Test: WV unit/integration tests. GtsMediaTestCases. Play movies
playback tests.
Change-Id: I01f622bc045e1012f2240b3775a6d121f9415463
2019-05-12 02:15:12 -07:00
Fred Gylys-Colwell
23c3bc8ebc
Report OEMCrypto Build Information in License Request
...
am: 5ee5d00514
2019-05-10 01:49:56 -07:00
Rahul Frias
7d78609548
Key Status should reflect key container security level
...
[ Merge of http://go/wvgerrit/77506 ]
Callers of MediaDrm can register to be notified when key status
changes and if they are usable for decryption. A number of factors
are evaluated when making this determination. Key container security
level will now be included in the evaluation.
Bug: 78652608
Test: WV unit/integration test, GtsMediaDrmTest, Play movies playback
testing.
Change-Id: I20243e5cb160f7957e3239e8d05f715ff0ee6dd6
2019-05-09 22:16:23 -07:00
Fred Gylys-Colwell
5ee5d00514
Report OEMCrypto Build Information in License Request
...
Merge from Widevine repo of http://go/wvgerrit/78623
This updates the license request client identification to include
OEMCrypto build information.
Bug: 129070445
Test: ExoPlayer on crosshatch with mod mock
Change-Id: I0dbce0cca4e9810e14f60561e4e434f1dbcadfb6
2019-05-09 13:24:04 -07:00
Adam Stone
c47c1d7575
Merge "Correctly sets provisioning state for test." into qt-dev
...
am: c71fb10b95
2019-05-08 17:32:51 -07:00
Adam Stone
c71fb10b95
Merge "Correctly sets provisioning state for test." into qt-dev
2019-05-08 23:29:17 +00:00
Adam Stone
3a27d2d649
Correctly sets provisioning state for test.
...
[ Merge from http://go/wvgerrit/78383 ]
Bug: http://b/121049662
Test: Re-ran the unit test.
Change-Id: I62c00f425c93b588e123ddd8b1093177f2e9b241
2019-05-08 14:13:28 -07:00
John Bruce
a10f45c497
Merge "Disallow Blank App Package Name on Q and Later" into qt-dev
...
am: 8a0ba4d0fa
2019-05-08 12:33:36 -07:00
John Bruce
8a0ba4d0fa
Merge "Disallow Blank App Package Name on Q and Later" into qt-dev
2019-05-08 18:58:40 +00:00
Fred Gylys-Colwell
d0b62c1b8d
Merge "Update unit tests for v15.2" into qt-dev
...
am: 2f79fe2773
2019-05-08 11:07:48 -07:00
Jeff Tinker
3caf992795
Merge "hidl plugin: add sendKeysChange_1_2" into qt-dev
...
am: 83068b97c8
2019-05-08 10:49:43 -07:00
Fred Gylys-Colwell
2f79fe2773
Merge "Update unit tests for v15.2" into qt-dev
2019-05-08 17:36:36 +00:00
Jeff Tinker
83068b97c8
Merge "hidl plugin: add sendKeysChange_1_2" into qt-dev
2019-05-08 17:17:43 +00:00
Fred Gylys-Colwell
a3d5e7be6a
Test MAC signature after license reload
...
am: 407d39699b
2019-05-08 00:09:35 -07:00
