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
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
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
e7bda1e2de
Merge "Unit test for OEMCrypto_LoadUsageEntry in multiple sessions" into rvc-dev am: bf5c819046 am: 8791b6ff22 am: 9423724f4e am: 8d935e8319 am: 030bbd7975
...
Change-Id: I5c144603b4399864aa0e59dd7cb3e5ad33e50125
2020-03-09 20:44:53 +00:00
Automerger Merge Worker
7dbd322d00
Filter out nonrequired tests for v15 devices am: a11d764d8d am: 6934d3242f am: 2f88a021e4 am: 2f42ee9a4a am: 5b4bc0eb72
...
Change-Id: Idbdd2969b2c2fdb56d25358d4ffa4e055af0b94f
2020-03-09 20:44:38 +00:00
Automerger Merge Worker
d3aceab600
Merge "Unit test for OEMCrypto_LoadUsageEntry in multiple sessions" into rvc-dev am: bf5c819046 am: f3eb69d209 am: 08ff07ca68 am: 2cc020b9a2
...
Change-Id: I0ed0aeedfb926179910d20d2dbd3c2d2033b2bd7
2020-03-09 20:44:10 +00:00
Automerger Merge Worker
36c15b7086
Filter out nonrequired tests for v15 devices am: a11d764d8d am: fd0b6b72ee am: 3eee42087a am: 7d57383437
...
Change-Id: I8feb2ef70569934eccf93cdf670bf01819f511e0
2020-03-09 20:43:48 +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
75d2e83fb7
Merge "Unit test for OEMCrypto_LoadUsageEntry in multiple sessions" into rvc-dev am: bf5c819046 am: 8791b6ff22 am: d5eac2c5fb am: dcbf1e7361
...
Change-Id: I526bbce1dad4febe5c9a776a99add46b503cd5cb
2020-03-09 20:43:19 +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
b4856f1d4e
Filter out nonrequired tests for v15 devices am: a11d764d8d am: 6934d3242f am: b8893bc73f am: 8568ced48d
...
Change-Id: I750b00e71ca4d833ee4b13b630176dfcde2e9a5d
2020-03-09 20:42:32 +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
