Commit Graph

3713 Commits

Author SHA1 Message Date
Automerger Merge Worker
433c61bf5d Merge "Cache Max Subsample Size" into rvc-dev am: 0bd6a38096 am: 1729fb68e4
Change-Id: I852a973ba31d6baf9e93454af42e7306fd8e6a3f
2020-03-09 21:42:49 +00:00
Automerger Merge Worker
6bc1b455f4 Merge "Treat the (0,0) Pattern as 'cbcs'" into rvc-dev am: 2356842fd2 am: d8c7168f43
Change-Id: I42b4df18fa6a4a48fca887a61c8dc6ce93225bb7
2020-03-09 21:42:40 +00:00
Automerger Merge Worker
e8e7c142e0 Merge "Cache Max Subsample Size" into rvc-dev am: 0bd6a38096 am: e61f87a18a
Change-Id: I1304dd3824ca258bbcd8978b963ad530c558945e
2020-03-09 21:42:35 +00:00
Automerger Merge Worker
6889037bb3 Merge "Remove ODK from unused makefiles" into rvc-dev am: 7da5b8be92 am: cbfb68abdc
Change-Id: I40ec39f7a6d9620bcd9af41a3aab4691e95ab582
2020-03-09 21:42:35 +00:00
Automerger Merge Worker
20745a3aca Merge "Cache Max Subsample Size" into rvc-dev am: 0bd6a38096 am: e61f87a18a
Change-Id: I89841afbc2c115664629fce1acf33bf55a59f925
2020-03-09 21:42:13 +00:00
Automerger Merge Worker
2aeaa05b60 Merge "Treat the (0,0) Pattern as 'cbcs'" into rvc-dev am: 2356842fd2
Change-Id: I70e27dcc685105105185fb8c23edfc05f88aee8e
2020-03-09 21:34:00 +00:00
Automerger Merge Worker
d8c7168f43 Merge "Treat the (0,0) Pattern as 'cbcs'" into rvc-dev am: 2356842fd2
Change-Id: I18327a1679ecba78d2ecf465e589713a8b8113cb
2020-03-09 21:32:15 +00:00
TreeHugger Robot
2356842fd2 Merge "Treat the (0,0) Pattern as 'cbcs'" into rvc-dev 2020-03-09 21:22:37 +00:00
Automerger Merge Worker
35ee931874 Merge "Remove ODK from unused makefiles" into rvc-dev am: 7da5b8be92
Change-Id: Id56f1650eaf2f612aa1e7f732406a710fab38495
2020-03-09 21:18:15 +00:00
Automerger Merge Worker
cbfb68abdc Merge "Remove ODK from unused makefiles" into rvc-dev am: 7da5b8be92
Change-Id: I35e3f958081d8431bacf2d94f2acb0bceb5ec34a
2020-03-09 21:18:06 +00:00
Automerger Merge Worker
1729fb68e4 Merge "Cache Max Subsample Size" into rvc-dev am: 0bd6a38096
Change-Id: I1193ffd0df03038f1937f48a1f3118445035c9ac
2020-03-09 21:17:54 +00:00
Automerger Merge Worker
e61f87a18a Merge "Cache Max Subsample Size" into rvc-dev am: 0bd6a38096
Change-Id: If860c7bbcc027a1492d7d5f502ee2bca95393eb7
2020-03-09 21:17:54 +00:00
TreeHugger Robot
7da5b8be92 Merge "Remove ODK from unused makefiles" into rvc-dev 2020-03-09 21:05:22 +00:00
TreeHugger Robot
0bd6a38096 Merge "Cache Max Subsample Size" into rvc-dev 2020-03-09 21:03:52 +00:00
Automerger Merge Worker
030bbd7975 Merge "Unit test for OEMCrypto_LoadUsageEntry in multiple sessions" into rvc-dev am: bf5c819046 am: 8791b6ff22 am: 9423724f4e am: 8d935e8319
Change-Id: I03e711eb20dd971ba2ca94a2a624eebe74615326
2020-03-09 20:43:36 +00:00
Automerger Merge Worker
5b4bc0eb72 Filter out nonrequired tests for v15 devices am: a11d764d8d am: 6934d3242f am: 2f88a021e4 am: 2f42ee9a4a
Change-Id: Ia46e19865d4c17fabf2e3e974473ba5eddd6228a
2020-03-09 20:42:57 +00:00
Automerger Merge Worker
2cc020b9a2 Merge "Unit test for OEMCrypto_LoadUsageEntry in multiple sessions" into rvc-dev am: bf5c819046 am: f3eb69d209 am: 08ff07ca68
Change-Id: I40c8ff4669465dfa7c01b526ab67871bed329b21
2020-03-09 20:34:08 +00:00
Automerger Merge Worker
08ff07ca68 Merge "Unit test for OEMCrypto_LoadUsageEntry in multiple sessions" into rvc-dev am: bf5c819046 am: f3eb69d209
Change-Id: Ie448b1c9a8883aa985e4d5a5c313bea4efcf9a57
2020-03-09 20:32:25 +00:00
Automerger Merge Worker
7d57383437 Filter out nonrequired tests for v15 devices am: a11d764d8d am: fd0b6b72ee am: 3eee42087a
Change-Id: Idb6b3843581c30229136cb175f1fcf7986f4df1e
2020-03-09 20:31:47 +00:00
Automerger Merge Worker
3eee42087a Filter out nonrequired tests for v15 devices am: a11d764d8d am: fd0b6b72ee
Change-Id: Ifd890bc9770ac6f100776051ad2dfaa090ab1394
2020-03-09 20:28:25 +00:00
Automerger Merge Worker
dcbf1e7361 Merge "Unit test for OEMCrypto_LoadUsageEntry in multiple sessions" into rvc-dev am: bf5c819046 am: 8791b6ff22 am: d5eac2c5fb
Change-Id: Icfd732667a0173c1baae621b988aa93ef4975687
2020-03-09 20:25:18 +00:00
Automerger Merge Worker
8d935e8319 Merge "Unit test for OEMCrypto_LoadUsageEntry in multiple sessions" into rvc-dev am: bf5c819046 am: 8791b6ff22 am: 9423724f4e
Change-Id: I05ed0fe24251fd7489725d621f016cbf652e73c5
2020-03-09 20:24:42 +00:00
Automerger Merge Worker
8568ced48d Filter out nonrequired tests for v15 devices am: a11d764d8d am: 6934d3242f am: b8893bc73f
Change-Id: Id276c3f3d2123fcd12af3351f1cf60b55b5c3858
2020-03-09 20:24:15 +00:00
Automerger Merge Worker
2f42ee9a4a Filter out nonrequired tests for v15 devices am: a11d764d8d am: 6934d3242f am: 2f88a021e4
Change-Id: I0b4289622cdeec9ba99c274c5565199e2c089bc9
2020-03-09 20:23:56 +00:00
Automerger Merge Worker
9423724f4e Merge "Unit test for OEMCrypto_LoadUsageEntry in multiple sessions" into rvc-dev am: bf5c819046 am: 8791b6ff22
Change-Id: Iab1906a1422835ef785c66aba273a07b7123b871
2020-03-09 20:15:47 +00:00
Automerger Merge Worker
d5eac2c5fb Merge "Unit test for OEMCrypto_LoadUsageEntry in multiple sessions" into rvc-dev am: bf5c819046 am: 8791b6ff22
Change-Id: I335fef53b1055c567aafeba20f74365cbbad1a1a
2020-03-09 20:15:39 +00:00
Automerger Merge Worker
f3eb69d209 Merge "Unit test for OEMCrypto_LoadUsageEntry in multiple sessions" into rvc-dev am: bf5c819046
Change-Id: I058ca965bbd6243243d7670b145ab5b628fefdae
2020-03-09 20:11:04 +00:00
Automerger Merge Worker
8791b6ff22 Merge "Unit test for OEMCrypto_LoadUsageEntry in multiple sessions" into rvc-dev am: bf5c819046
Change-Id: I875f2df0bed5a97192ce702a4be456a573bedb95
2020-03-09 20:10:04 +00:00
Automerger Merge Worker
2f88a021e4 Filter out nonrequired tests for v15 devices am: a11d764d8d am: 6934d3242f
Change-Id: I58e1488e57c76d814edc5272f5cc3528dfd44611
2020-03-09 20:08:23 +00:00
Automerger Merge Worker
b8893bc73f Filter out nonrequired tests for v15 devices am: a11d764d8d am: 6934d3242f
Change-Id: Icb23ef76f858863e3e9c0fdf5e9bcaf93efda86d
2020-03-09 20:08:19 +00:00
Automerger Merge Worker
fd0b6b72ee Filter out nonrequired tests for v15 devices am: a11d764d8d
Change-Id: I7930b51607b64ae66e0bce920c1c06a4dbd207e6
2020-03-09 20:05:29 +00:00
Automerger Merge Worker
6934d3242f Filter out nonrequired tests for v15 devices am: a11d764d8d
Change-Id: I6f57e852368bc8552f3dcbae4a486db99d82a12c
2020-03-09 19:59:15 +00:00
TreeHugger Robot
bf5c819046 Merge "Unit test for OEMCrypto_LoadUsageEntry in multiple sessions" into rvc-dev 2020-03-09 19:20:55 +00:00
Fred Gylys-Colwell
bfde826763 Unit test for OEMCrypto_LoadUsageEntry in multiple sessions
Merge from Widevine repo of http://go/wvgerrit/95283

If an entry is loaded in a second session, the error should be
OEMCrypto_ERROR_INVALID_SESSION.

Bug: 150647218
Test: ran unit tests
  Change-Id: I4e666ce6626303a36b16997f0a012d57a7039697
Change-Id: Id0e73dec5879ec9ec4e8ab8ebe1590c568e7f0af
2020-03-07 10:58:50 -08:00
Fred Gylys-Colwell
a11d764d8d Filter out nonrequired tests for v15 devices
Merge from Widevine repo of http://go/wvgerrit/95263

Some OEMCrypto unit tests are not expected to pass on a v15 device, so
they are being filtered out.

Bug: 149861744
Test: unit tests on taimen
Change-Id: Iadff592f4a0005ab7e5613b315a714e737d7e5e0
2020-03-06 15:49:17 -08:00
Fred Gylys-Colwell
96dc665cd5 Remove ODK from unused makefiles
Merge from Widevine repo of http://go/wvgerrit/95087

The ODK library is used in OEMCrypto, and in test code, but it is not
needed in the CDM layer. As such, it can be removed from the
Android.mk for cdm libraries.

Bug: 150809634
Test: unit tests
Change-Id: If29458e7d3d940f9a383d77e5082e7388e19c32f
2020-03-06 18:58:50 +00:00
Automerger Merge Worker
0b40a5c871 Merge "Update ODK Library and add license release unit test" into rvc-dev am: 174c57bb59 am: ae5ff19c3a am: 1cc466e9f6 am: 181d5a4a89
Change-Id: I9131b1a95f824976d9b02fb41f400ae9cc148ba8
2020-03-05 22:20:50 +00:00
Automerger Merge Worker
99a36ce909 Merge "Update ODK Library and add license release unit test" into rvc-dev am: 174c57bb59 am: 3bd9a2aaf8 am: e6da00a6b7
Change-Id: I0ffd5d0e6c64b207f8945715fe8f0e5334e3c00f
2020-03-05 22:07:51 +00:00
Automerger Merge Worker
181d5a4a89 Merge "Update ODK Library and add license release unit test" into rvc-dev am: 174c57bb59 am: ae5ff19c3a am: 1cc466e9f6
Change-Id: I17e771b449c231c0329361aac0b2096baa6ae944
2020-03-05 22:07:38 +00:00
Automerger Merge Worker
e36b9c3432 Merge "Update ODK Library and add license release unit test" into rvc-dev am: 174c57bb59 am: ae5ff19c3a am: 511335d53b
Change-Id: I709904385287d4b7199153b54245aca14291ad2b
2020-03-05 22:07:36 +00:00
Automerger Merge Worker
1cc466e9f6 Merge "Update ODK Library and add license release unit test" into rvc-dev am: 174c57bb59 am: ae5ff19c3a
Change-Id: I19916fdcbd64129e8b0ae208d69ce69375c16555
2020-03-05 21:54:09 +00:00
Automerger Merge Worker
e6da00a6b7 Merge "Update ODK Library and add license release unit test" into rvc-dev am: 174c57bb59 am: 3bd9a2aaf8
Change-Id: Ibfefb3c38c91b4b698914a1d126b96cc43e1bf2c
2020-03-05 21:54:09 +00:00
Automerger Merge Worker
511335d53b Merge "Update ODK Library and add license release unit test" into rvc-dev am: 174c57bb59 am: ae5ff19c3a
Change-Id: Iccb53a9a23c6c4d43cda60e6c587f6e885b3d165
2020-03-05 21:53:52 +00:00
Automerger Merge Worker
ae5ff19c3a Merge "Update ODK Library and add license release unit test" into rvc-dev am: 174c57bb59
Change-Id: Idb759df35395da86809c221da316de3c4b2ced24
2020-03-05 21:30:54 +00:00
Automerger Merge Worker
3bd9a2aaf8 Merge "Update ODK Library and add license release unit test" into rvc-dev am: 174c57bb59
Change-Id: Ia5007722da0074c8c1cfefcb91bdd0feb28a027a
2020-03-05 21:30:41 +00:00
Fred Gylys-Colwell
174c57bb59 Merge "Update ODK Library and add license release unit test" into rvc-dev 2020-03-05 21:16:55 +00:00
Fred Gylys-Colwell
c5b7a01ab5 Update ODK Library and add license release unit test
Merge from Widevine repo of two CLs.

Merge from Widevine repo of http://go/wvgerrit/94743

A license release should not have a core message. This CL adjusts the
existing unit tests to verify this. There is also a new unit test called
SecureStop that explicitly tests sending a secure stop in a new
session without first loading the license.

Merge from Widevine repo of http://go/wvgerrit/94865

This CL has the following changes copied from google3:
http://cr/298871728 Remove odk_static_assert for Message size temporarily
http://cr/298755935 Fix a compiling error during macro expansion
http://cr/298481745 Add missing header for android
http://cr/298448142 Fix odk_test gyp file
http://cr/298419641 Remove header from Android.bp
http://cr/298402053 Separate sizeOf(args) bytes in fuzz tests
http://cr/297730316 No core messages for license release
http://cr/297714346 Add copybara_test and piper_sot_to_gerrit
http://cr/297636713 Adding some comments around boolean conversion code
http://cr/297420679 Autofuzzer when ran with address sanitizer ...
http://cr/296513584 Minor fix with fuzzing odk clock values
http://cr/296322024 Fixing errors in code with how request ...
http://cr/296313159 Fuzzing ODK clock values by setting aside ...
http://cr/295763207 Add more odk tests and move helper functions to test helper
http://cr/294524098 Adding a Build Rule for ODK_KDO_Fuzzer and updating
http://cr/294492213 Address a few review comments of ODK
http://cr/293674368 odk_fuzz: add TODOs & comments
http://cr/293492806 Fix spelling

Bug: 150243585
Bug: 150020278
Bug: 150095506
Bug: 147297226
Bug: 148290294
Bug: 148907684
Bug: 150608451
Test: unit tests
Change-Id: I25fd406f29f4eba40f5cb27e9a1317dce4ffc2f5
2020-03-05 19:06:31 +00:00
Automerger Merge Worker
c848077bba Merge "Correct log messages" into rvc-dev am: d0d3216eda am: ec2d331246 am: 030aabb66f am: 2b37161991
Change-Id: Ic0e1da4108e10c2269480e38734115874038c1ef
2020-03-05 00:43:30 +00:00
Automerger Merge Worker
d23eaff1ab Merge "Correct log messages" into rvc-dev am: d0d3216eda am: b093ce8733 am: 69f1ab03c7
Change-Id: I84e231b9a79a5a6dc8a8753bca41429a7dae4484
2020-03-05 00:37:20 +00:00
Automerger Merge Worker
3eeab6d48d Merge "Correct log messages" into rvc-dev am: d0d3216eda am: ec2d331246 am: 5e9ab5aa83
Change-Id: I779aab44b25c88068eaa62d197c44df4a9157792
2020-03-05 00:36:54 +00:00