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

3526 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
9a036954f6 Merge "Remove ODK from unused makefiles" into rvc-dev am: 7da5b8be92 am: cbfb68abdc am: 6889037bb3 am: a83d57fd11 
Change-Id: I561a71059aea05305c4f7ed93c62fbbf20e412b4
 2020-03-09 22:14:15 +00:00
Automerger Merge Worker
2be73425ec Merge "Cache Max Subsample Size" into rvc-dev am: 0bd6a38096 am: e61f87a18a am: 20745a3aca am: ae45b71093 
Change-Id: Ice9d5f14148431962f59d51d75861be795c54bc5
 2020-03-09 22:14:09 +00:00
Automerger Merge Worker
66eb58015d Merge "Treat the (0,0) Pattern as 'cbcs'" into rvc-dev am: 2356842fd2 am: 2aeaa05b60 am: 211efe559d 
Change-Id: Ib76c9a67245fe956f9b0bc714016bd49884ea48d
 2020-03-09 22:09:20 +00:00
Automerger Merge Worker
99714dee14 Merge "Remove ODK from unused makefiles" into rvc-dev am: 7da5b8be92 am: 35ee931874 am: f14c6f1ea5 
Change-Id: I98d488c5e004ad413fd1735633ca2e12e4201f82
 2020-03-09 22:09:04 +00:00
Automerger Merge Worker
3055598b0b Merge "Treat the (0,0) Pattern as 'cbcs'" into rvc-dev am: 2356842fd2 am: d8c7168f43 am: 3342d9b32a 
Change-Id: Idbae003538dbe18e7254200ce3095a396cda9666
 2020-03-09 22:09:00 +00:00
Automerger Merge Worker
1a67c9aadd Merge "Remove ODK from unused makefiles" into rvc-dev am: 7da5b8be92 am: cbfb68abdc am: 35fd7cd921 
Change-Id: Ic2b9c3fbb31ba2987c8bf2f7ce90d09fa45df8db
 2020-03-09 22:08:55 +00:00
Automerger Merge Worker
abaa581660 Merge "Cache Max Subsample Size" into rvc-dev am: 0bd6a38096 am: 1729fb68e4 am: 433c61bf5d 
Change-Id: Id5b7e9755eee20ddfebc8cc02cab01e188bc07f9
 2020-03-09 22:08:49 +00:00
Automerger Merge Worker
57d81d1954 Merge "Cache Max Subsample Size" into rvc-dev am: 0bd6a38096 am: e61f87a18a am: e8e7c142e0 
Change-Id: Ie4fcbfdf4fb118cb08dd2e266e2fecd5ca77575a
 2020-03-09 22:07:25 +00:00
Automerger Merge Worker
a83d57fd11 Merge "Remove ODK from unused makefiles" into rvc-dev am: 7da5b8be92 am: cbfb68abdc am: 6889037bb3 
Change-Id: I867f3d65571ae4b2d84c248e7f7b89e56f3892a2
 2020-03-09 22:00:15 +00:00
Automerger Merge Worker
ae45b71093 Merge "Cache Max Subsample Size" into rvc-dev am: 0bd6a38096 am: e61f87a18a am: 20745a3aca 
Change-Id: I12cdf76722436d7f8f4deb266cdea0272d9a7703
 2020-03-09 22:00:07 +00:00
Automerger Merge Worker
211efe559d Merge "Treat the (0,0) Pattern as 'cbcs'" into rvc-dev am: 2356842fd2 am: 2aeaa05b60 
Change-Id: Ibd94ac68e77e1082ddd37b6b4021cce4be168c2c
 2020-03-09 21:43:26 +00:00
Automerger Merge Worker
f14c6f1ea5 Merge "Remove ODK from unused makefiles" into rvc-dev am: 7da5b8be92 am: 35ee931874 
Change-Id: I0b6c5753c558021adb56061bca1823aa165ee508
 2020-03-09 21:43:12 +00:00
Automerger Merge Worker
3342d9b32a Merge "Treat the (0,0) Pattern as 'cbcs'" into rvc-dev am: 2356842fd2 am: d8c7168f43 
Change-Id: Id62d6000461556b958bc4b921b755cac3eaf5f20
 2020-03-09 21:43:00 +00:00
Automerger Merge Worker
35fd7cd921 Merge "Remove ODK from unused makefiles" into rvc-dev am: 7da5b8be92 am: cbfb68abdc 
Change-Id: I69e7e60f87061974a9bb499364c15a306c3e098a
 2020-03-09 21:42:54 +00:00
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
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