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

3601 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
8f4420761e L3 oemcrypto: Replace NULL with nullptr am: 5cd0fd7992 am: ace03ffb04 am: 6d086900d0 am: bd352fb549 
Change-Id: Idec6e51026b4396a72e250f16c602b9028a205e6
 2020-03-12 00:04:52 +00:00
Automerger Merge Worker
7b78f69127 L3 oemcrypto: Replace NULL with nullptr am: 5cd0fd7992 am: 93e106639c am: ad09f8de21 
Change-Id: I69e4972b038798b02e3b55dbc948e0834bf5c8c4
 2020-03-11 23:50:20 +00:00
Automerger Merge Worker
5fb9c96d35 L3 oemcrypto: Replace NULL with nullptr am: 5cd0fd7992 am: ace03ffb04 am: 6acc649d33 
Change-Id: I7770af608299d648b3e5322a4ebacd6dc9672a0a
 2020-03-11 23:50:05 +00:00
Automerger Merge Worker
bd352fb549 L3 oemcrypto: Replace NULL with nullptr am: 5cd0fd7992 am: ace03ffb04 am: 6d086900d0 
Change-Id: Id03ace17052f3246ea2fbde15e152118be663771
 2020-03-11 23:49:55 +00:00
Automerger Merge Worker
ad09f8de21 L3 oemcrypto: Replace NULL with nullptr am: 5cd0fd7992 am: 93e106639c 
Change-Id: I1e2c56a682d88c3acbd61e58ad87faa77c00e3a3
 2020-03-11 23:35:42 +00:00
Automerger Merge Worker
6acc649d33 L3 oemcrypto: Replace NULL with nullptr am: 5cd0fd7992 am: ace03ffb04 
Change-Id: I068b8ab7e8fc33dfcbf3c40111dfb0d4d446bb58
 2020-03-11 23:35:32 +00:00
Automerger Merge Worker
6d086900d0 L3 oemcrypto: Replace NULL with nullptr am: 5cd0fd7992 am: ace03ffb04 
Change-Id: I9d1c26d7275dc03d8f157a76286ae655c3602a88
 2020-03-11 23:35:21 +00:00
Automerger Merge Worker
93e106639c L3 oemcrypto: Replace NULL with nullptr am: 5cd0fd7992 
Change-Id: If73c5faa27ee6da1c237c3045291a57638e23453
 2020-03-11 23:23:22 +00:00
Automerger Merge Worker
ace03ffb04 L3 oemcrypto: Replace NULL with nullptr am: 5cd0fd7992 
Change-Id: I71c41ba43edb99f167435c72d02ec97de4948b34
 2020-03-11 23:22:56 +00:00
Cong Lin
5cd0fd7992 L3 oemcrypto: Replace NULL with nullptr 
Merge from Widevine repo of https://widevine-internal-review.git.corp.google.com/c/cdm/+/95206

Only one file is affected in Android repo.

Bug: 149050172
Test: Unit tests
Change-Id: I3251b9997733e59b18c0b5727205067dcc3a963c
 2020-03-10 19:47:36 -07:00
Automerger Merge Worker
f230d9e135 Merge "Update tests for license release" into rvc-dev am: b8570949e4 am: e77b1913c9 am: fe39864311 am: 569ae88a81 
Change-Id: I7001acf3a4881d8038eaa051cdb5895d4fdc922e
 2020-03-10 09:44:39 +00:00
Automerger Merge Worker
1c6aa9c125 Merge "Update tests for license release" into rvc-dev am: b8570949e4 am: ea944065a1 am: 20f35baf2e 
Change-Id: Ie325df8a796b2a506d9210c4f6e5142056bb282f
 2020-03-10 09:29:21 +00:00
Automerger Merge Worker
776622e092 Merge "Update tests for license release" into rvc-dev am: b8570949e4 am: e77b1913c9 am: 3e1ededa8b 
Change-Id: I4e02b4037520a7ba0500b1914f7780c1b705a6f5
 2020-03-10 09:29:12 +00:00
Automerger Merge Worker
569ae88a81 Merge "Update tests for license release" into rvc-dev am: b8570949e4 am: e77b1913c9 am: fe39864311 
Change-Id: I454a99e3da614daad2b2be6fa29360974522e998
 2020-03-10 09:28:48 +00:00
Automerger Merge Worker
fe39864311 Merge "Update tests for license release" into rvc-dev am: b8570949e4 am: e77b1913c9 
Change-Id: Id0f3d0844b25bf282df29637e831f76b58bbfb33
 2020-03-10 09:19:09 +00:00
Automerger Merge Worker
20f35baf2e Merge "Update tests for license release" into rvc-dev am: b8570949e4 am: ea944065a1 
Change-Id: Ia2d7da3accd5db42206801a27d490d7e7fa2a337
 2020-03-10 09:18:59 +00:00
Automerger Merge Worker
3e1ededa8b Merge "Update tests for license release" into rvc-dev am: b8570949e4 am: e77b1913c9 
Change-Id: Ie350a8e49993d37cc8d263633469eb97ec89257a
 2020-03-10 09:18:45 +00:00
Automerger Merge Worker
ea944065a1 Merge "Update tests for license release" into rvc-dev am: b8570949e4 
Change-Id: I625fb36cfe62ff600c9428f10061d397ffb6c68c
 2020-03-10 09:02:22 +00:00
Automerger Merge Worker
e77b1913c9 Merge "Update tests for license release" into rvc-dev am: b8570949e4 
Change-Id: I78abac92ac31ba82904058c3c80ccacf3edbbada
 2020-03-10 09:01:45 +00:00
TreeHugger Robot
b8570949e4 Merge "Update tests for license release" into rvc-dev 2020-03-10 08:49:47 +00:00
Fred Gylys-Colwell
469c17777e Match usage entry to header 
Merge from Widevine repo of http://go/wvgerrit/95463

In the unit tests ReloadUsageTableWithSkew, we load a header that has
a generation number off by 1. This is allowed. However, we then try to
load the current entry, which is newer than the header. Instead, we
should try to load the entry that went with the header.

Bug: 139828114
Test: Ran unit tests
Change-Id: I87261501d8ee2b91a07c2b5dff17fc0ea950244d
 2020-03-09 20:40:15 -07:00
Fred Gylys-Colwell
037918aa49 Update tests for license release 
Merge from Widevine repo of http://go/wvgerrit/95403

This updates the test code CreateDefaultResponse to make sure that
license releases do not have a core message, and that the key control
block is correctly set for renewals.

Also, the unit test OEMCryptoUsageTableTest.TimingTest is changed to
only a license release when the license is inactive. If the license is
still active, then the license is loaded before generating a usage
report.

Test: Ran full unit tests
Bug: 151092673
Change-Id: I7c01fd17f9b66e88ab3c57aa0f3d40740f13507c
 2020-03-09 20:11:23 -07:00
Automerger Merge Worker
5141405908 Merge "Treat the (0,0) Pattern as 'cbcs'" into rvc-dev am: 2356842fd2 am: d8c7168f43 am: 6bc1b455f4 am: f2b5e546d4 
Change-Id: I0653f204ec3570c634928cdbe2ae41319d04de1f
 2020-03-09 22:14:19 +00:00
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
f2b5e546d4 Merge "Treat the (0,0) Pattern as 'cbcs'" into rvc-dev am: 2356842fd2 am: d8c7168f43 am: 6bc1b455f4 
Change-Id: I4f9022c295dfc3a8c9532900e8412f232c2c3c7b
 2020-03-09 22:00:19 +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
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