Automerger Merge Worker
dbd091b4b6
L3 oemcrypto: Replace NULL with nullptr am: 5cd0fd7992 am: 93e106639c am: ad09f8de21 am: 7b78f69127
...
Change-Id: I36b3969d38ccae5e55e37637165d02db1d54f629
2020-03-12 00:04:43 +00:00
Automerger Merge Worker
3777f1389d
L3 oemcrypto: Replace NULL with nullptr am: 5cd0fd7992 am: ace03ffb04 am: 6acc649d33 am: 5fb9c96d35
...
Change-Id: I93deefe19d76b7f9b544efd278ed1535adb7fd0b
2020-03-12 00:04:15 +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
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
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
778f75b210
Merge "Update tests for license release" into rvc-dev am: b8570949e4 am: e77b1913c9 am: fe39864311 am: 569ae88a81 am: f230d9e135
...
Change-Id: If1889558fe3e217a0e795a2d166efd4fe7295301
2020-03-10 09:46:05 +00:00
Automerger Merge Worker
f63435d888
Merge "Update tests for license release" into rvc-dev am: b8570949e4 am: ea944065a1 am: 20f35baf2e am: 1c6aa9c125
...
Change-Id: If6920f4ec1f33722215ac0d1cb3ab66a6834670e
2020-03-10 09:45:52 +00:00
Automerger Merge Worker
1412636ea0
Merge "Update tests for license release" into rvc-dev am: b8570949e4 am: e77b1913c9 am: 3e1ededa8b am: 776622e092
...
Change-Id: I31e237cff88eb2d875e20dbd39757bc6c47db7b9
2020-03-10 09:45:15 +00: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
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
acbac70372
Merge "Treat the (0,0) Pattern as 'cbcs'" into rvc-dev am: 2356842fd2 am: d8c7168f43 am: 6bc1b455f4 am: f2b5e546d4 am: 5141405908
...
Change-Id: I25686ede0cd67f122b31c352182bf0e7a6cfa0bf
2020-03-09 22:48:57 +00:00
Automerger Merge Worker
1fb602a0f3
Merge "Remove ODK from unused makefiles" into rvc-dev am: 7da5b8be92 am: cbfb68abdc am: 6889037bb3 am: a83d57fd11 am: 9a036954f6
...
Change-Id: Iba9cb28a25b4cfa0a99c849a443725eb405e6630
2020-03-09 22:47:38 +00:00
Automerger Merge Worker
0aa8b2fa73
Merge "Cache Max Subsample Size" into rvc-dev am: 0bd6a38096 am: e61f87a18a am: 20745a3aca am: ae45b71093 am: 2be73425ec
...
Change-Id: If19aac453a65df2e45b8107c091161c36e6995af
2020-03-09 22:46:47 +00:00
Automerger Merge Worker
6cbfac35b7
Merge "Treat the (0,0) Pattern as 'cbcs'" into rvc-dev am: 2356842fd2 am: 2aeaa05b60 am: 211efe559d am: 66eb58015d
...
Change-Id: I715bf952eea91193ff753801407d3509edc17215
2020-03-09 22:45:29 +00:00
Automerger Merge Worker
51146781ee
Merge "Remove ODK from unused makefiles" into rvc-dev am: 7da5b8be92 am: 35ee931874 am: f14c6f1ea5 am: 99714dee14
...
Change-Id: I05b2fec014446d8338a837d44977a9da4a8a33ff
2020-03-09 22:44:52 +00:00
Automerger Merge Worker
40ba59271e
Merge "Treat the (0,0) Pattern as 'cbcs'" into rvc-dev am: 2356842fd2 am: d8c7168f43 am: 3342d9b32a am: 3055598b0b
...
Change-Id: I2a3c3339b7214587b251839cd5810940d94e11d9
2020-03-09 22:44:18 +00:00
Automerger Merge Worker
5dcf997c12
Merge "Remove ODK from unused makefiles" into rvc-dev am: 7da5b8be92 am: cbfb68abdc am: 35fd7cd921 am: 1a67c9aadd
...
Change-Id: Ifa10c07e5e2da8b4c8794e63f80b0ddf11b1e738
2020-03-09 22:43:29 +00:00
Automerger Merge Worker
25d6e1992e
Merge "Cache Max Subsample Size" into rvc-dev am: 0bd6a38096 am: 1729fb68e4 am: 433c61bf5d am: abaa581660
...
Change-Id: I1fa51db28d3cbb44611169a36b9f27b047b29d7d
2020-03-09 22:42:08 +00:00
Automerger Merge Worker
29cb8f4178
Merge "Cache Max Subsample Size" into rvc-dev am: 0bd6a38096 am: e61f87a18a am: e8e7c142e0 am: 57d81d1954
...
Change-Id: Ife1f06e9f8a0a2519a3d5b4cf4c12e9827da3c45
2020-03-09 22:39:55 +00: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
