Cong Lin
f5e7afe51d
Merge "Fix implicit type conversion issue in ODK" into rvc-dev am: c34e2af181
...
Change-Id: I3c00810baef5c538b655c8af58243723e228959b
2020-05-30 03:13:51 +00:00
Cong Lin
4f895ec8ec
Merge "Fix implicit type conversion issue in ODK" into rvc-dev am: c34e2af181
...
Change-Id: Idcdbf54471e640b79a9af2a924b139d1c5def0f5
2020-05-30 03:13:36 +00:00
Cong Lin
c34e2af181
Merge "Fix implicit type conversion issue in ODK" into rvc-dev
2020-05-30 02:56:31 +00:00
John Bruce
62543c2169
Merge "OEMCrypto Unit Test Fix: Do Not Derive Keys Immediately" into rvc-dev am: 729723b3d2 am: ec894e1bce am: 10283634b1 am: a81e8dd47b am: ffa5bcb2c3
...
Change-Id: Ic528df7967a5ddf8a6982d59c3c84151b92f44ae
2020-05-30 00:56:46 +00:00
John Bruce
d01d3e504d
Merge "OEMCrypto Unit Test Fix: Do Not Derive Keys Immediately" into rvc-dev am: 729723b3d2 am: b349680d3f am: 698b36b263 am: 836f0eab4a am: 4681b3654e
...
Change-Id: I628779c4bf2674b75e3082542d25895d9c915a1a
2020-05-30 00:56:25 +00:00
John Bruce
87660ab0e3
Merge "OEMCrypto Unit Test Fix: Do Not Derive Keys Immediately" into rvc-dev am: 729723b3d2 am: b349680d3f am: 00792ac231 am: 1c7dab441a am: 265ba61b5c
...
Change-Id: I800c026cafb01811337d365d533de494abc16c79
2020-05-30 00:55:57 +00:00
John Bruce
ffa5bcb2c3
Merge "OEMCrypto Unit Test Fix: Do Not Derive Keys Immediately" into rvc-dev am: 729723b3d2 am: ec894e1bce am: 10283634b1 am: a81e8dd47b
...
Change-Id: I183c93d3ea145aaa5a61031caae81a48a4b958a0
2020-05-30 00:33:17 +00:00
John Bruce
4681b3654e
Merge "OEMCrypto Unit Test Fix: Do Not Derive Keys Immediately" into rvc-dev am: 729723b3d2 am: b349680d3f am: 698b36b263 am: 836f0eab4a
...
Change-Id: Ieef065860ef2d846f4b8f7dd377f57346e8860fa
2020-05-30 00:33:04 +00:00
John Bruce
265ba61b5c
Merge "OEMCrypto Unit Test Fix: Do Not Derive Keys Immediately" into rvc-dev am: 729723b3d2 am: b349680d3f am: 00792ac231 am: 1c7dab441a
...
Change-Id: I1bada2a5657eb38a8271d2da2199b145a8966d6c
2020-05-30 00:32:39 +00:00
John Bruce
a81e8dd47b
Merge "OEMCrypto Unit Test Fix: Do Not Derive Keys Immediately" into rvc-dev am: 729723b3d2 am: ec894e1bce am: 10283634b1
...
Change-Id: Ic22ea775291b3194392617b1c970c5da1cf6009d
2020-05-30 00:19:45 +00:00
John Bruce
836f0eab4a
Merge "OEMCrypto Unit Test Fix: Do Not Derive Keys Immediately" into rvc-dev am: 729723b3d2 am: b349680d3f am: 698b36b263
...
Change-Id: I84065aa6802f7db2cde7aec844e810180d3dc6e8
2020-05-30 00:16:34 +00:00
John Bruce
1c7dab441a
Merge "OEMCrypto Unit Test Fix: Do Not Derive Keys Immediately" into rvc-dev am: 729723b3d2 am: b349680d3f am: 00792ac231
...
Change-Id: I8b60d454a4b3c4aac8670f3bcef95cc249c50f0b
2020-05-30 00:16:05 +00:00
John Bruce
10283634b1
Merge "OEMCrypto Unit Test Fix: Do Not Derive Keys Immediately" into rvc-dev am: 729723b3d2 am: ec894e1bce
...
Change-Id: Ide72822e741b0a6c736ac00d39ebd0e6fd9bcf56
2020-05-29 23:57:09 +00:00
John Bruce
00792ac231
Merge "OEMCrypto Unit Test Fix: Do Not Derive Keys Immediately" into rvc-dev am: 729723b3d2 am: b349680d3f
...
Change-Id: I98a604729446a2e3ade173e4e473331034937dd0
2020-05-29 23:57:09 +00:00
John Bruce
698b36b263
Merge "OEMCrypto Unit Test Fix: Do Not Derive Keys Immediately" into rvc-dev am: 729723b3d2 am: b349680d3f
...
Change-Id: I3b54a66197769dffa7d78030a9c79f673a426f7b
2020-05-29 23:56:58 +00:00
John Bruce
5ce6971993
Merge "OEMCrypto Unit Test Fix: Do Not Derive Keys Immediately" into rvc-dev am: 729723b3d2
...
Change-Id: I35685fa3b2e7a5db8b564b3ee076c3f2f3e38325
2020-05-29 23:41:13 +00:00
John Bruce
b349680d3f
Merge "OEMCrypto Unit Test Fix: Do Not Derive Keys Immediately" into rvc-dev am: 729723b3d2
...
Change-Id: I72df59375a2c05e47978abc37418ebc69f308bdc
2020-05-29 23:40:52 +00:00
John Bruce
ec894e1bce
Merge "OEMCrypto Unit Test Fix: Do Not Derive Keys Immediately" into rvc-dev am: 729723b3d2
...
Change-Id: I1e4a4c7c54e24f4f754cbe1ef6b5ec7c665dd509
2020-05-29 23:40:49 +00:00
John Bruce
729723b3d2
Merge "OEMCrypto Unit Test Fix: Do Not Derive Keys Immediately" into rvc-dev
2020-05-29 23:26:50 +00:00
Cong Lin
69e7e21882
Fix implicit type conversion issue in ODK
...
Merging CL
https://widevine-internal-review.googlesource.com/c/cdm/+/100924 Fix implicit type conversion issue in ODK
1. Implicit cast is reported as error when compiling ODK with Level3
2. Override odk_add_overflow_xxx function with the built in functions can cause
redefinition issue when compiling Level3; Let's use odk customized overflow functions.
Bug: b/157510403
Test: ODK unittests and CDM unittests passed.
Change-Id: Ieef8ccfb41d08007ec72f4a061f92968e55539cb
2020-05-29 10:07:08 -07:00
Automerger Merge Worker
b8578bfd7a
Merge "Rolled expected version number for R. am: dd70d63b76 am: 9329bf331c am: de022fbb0a" into rvc-qpr-dev-plus-aosp am: 082ec81465 am: 86e773636c
...
Change-Id: I8b461866d1dde5d3723038bd5ce520def2559463
2020-05-27 22:31:03 +00:00
Alex Dale
078b1d4a92
Rolled expected version number for R. am: dd70d63b76 am: 3316ea8c53 am: e8cfec7c67 am: 063db9cf02 am: ee2e37e935
...
Change-Id: I7de72fe5c093305b036bc444f92d3482feee7411
2020-05-27 22:30:58 +00:00
Alex Dale
c84ad0d971
Rolled expected version number for R. am: dd70d63b76 am: 9329bf331c am: 7eb1c2b619 am: 32f70b0464 am: 94314def43
...
Change-Id: Ief698cac71f694a1f2428765bf442c9c1ee1162c
2020-05-27 22:30:52 +00:00
Automerger Merge Worker
86e773636c
Merge "Rolled expected version number for R. am: dd70d63b76 am: 9329bf331c am: de022fbb0a" into rvc-qpr-dev-plus-aosp am: 082ec81465
...
Change-Id: I27f364a6d71f319afb7adcff4affc5d65fe58f56
2020-05-27 22:11:54 +00:00
Alex Dale
ee2e37e935
Rolled expected version number for R. am: dd70d63b76 am: 3316ea8c53 am: e8cfec7c67 am: 063db9cf02
...
Change-Id: Ifd1d680f3621a1e411a55d2838cabec2fafbc159
2020-05-27 22:11:48 +00:00
Alex Dale
94314def43
Rolled expected version number for R. am: dd70d63b76 am: 9329bf331c am: 7eb1c2b619 am: 32f70b0464
...
Change-Id: I4f6d3d744869708d538b5d0881044ab0d605e0a8
2020-05-27 22:11:40 +00:00
Automerger Merge Worker
082ec81465
Merge "Rolled expected version number for R. am: dd70d63b76 am: 9329bf331c am: de022fbb0a" into rvc-qpr-dev-plus-aosp
2020-05-27 21:59:28 +00:00
Alex Dale
9f936a877d
Rolled expected version number for R. am: dd70d63b76 am: 9329bf331c am: de022fbb0a
...
Change-Id: I300d1f145e620a908a7ea0c50c86b34469e775a7
2020-05-27 21:59:24 +00:00
Alex Dale
063db9cf02
Rolled expected version number for R. am: dd70d63b76 am: 3316ea8c53 am: e8cfec7c67
...
Change-Id: I1fee67f9cf299d5c6b482f9aebae04edd481c853
2020-05-27 21:59:20 +00:00
Alex Dale
32f70b0464
Rolled expected version number for R. am: dd70d63b76 am: 9329bf331c am: 7eb1c2b619
...
Change-Id: I80383dcc06a4ca5a2b7854e3f8075a7f0d97cdea
2020-05-27 21:59:14 +00:00
Alex Dale
e8cfec7c67
Rolled expected version number for R. am: dd70d63b76 am: 3316ea8c53
...
Change-Id: I66a5a56e3c11a86f82e920d20e309c852d3179e8
2020-05-27 21:44:10 +00:00
Alex Dale
7eb1c2b619
Rolled expected version number for R. am: dd70d63b76 am: 9329bf331c
...
Change-Id: Idc9fe4cee6699c6d35c828f4c4fa0075f3ccfaa2
2020-05-27 21:44:02 +00:00
Alex Dale
de022fbb0a
Rolled expected version number for R. am: dd70d63b76 am: 9329bf331c
...
Change-Id: Iae1998e8dd00a286c7d44bdb2093be860d97fb0d
2020-05-27 21:43:58 +00:00
Alex Dale
3316ea8c53
Rolled expected version number for R. am: dd70d63b76
...
Change-Id: I0e80a32a474d0e0229ef3b1f73ff06c4f60d785f
2020-05-27 21:25:03 +00:00
Alex Dale
50e966a8d0
Rolled expected version number for R. am: dd70d63b76
...
Change-Id: Ia8d9d157cc30c0017220e217a75d496fa9318b49
2020-05-27 21:25:02 +00:00
Alex Dale
9329bf331c
Rolled expected version number for R. am: dd70d63b76
...
Change-Id: Id8ddfa7e676b57eb0ab8261d166dd0cf8901a458
2020-05-27 21:24:39 +00:00
Alex Dale
dd70d63b76
Rolled expected version number for R.
...
[ Merge of http://go/wvgerrit/100403 ]
VersionNumberTest.VersionNumberChangeCanary was expecting a version
string of "R". However, Android rvc branch is now far enough into
development to use a numbered version: version "11".
Bug: 156853733
Test: Android license request test
Change-Id: I63d33f742c849b672b2d2402ab8423fdf2450f6f
2020-05-27 17:27:46 +00:00
TreeHugger Robot
f3615c35bc
Merge "The Entitlement key map was not being cleaned up." into rvc-dev am: bd8e573e0c am: a22fc9fa8e am: 549a259ef9 am: 97ce58fdb6 am: 0acdd25a3f
...
Change-Id: Ie479c42688391def0dc3a23daba3f060747e2ea2
2020-05-27 05:17:57 +00:00
Automerger Merge Worker
b7e7dea7b9
Merge "Merge "Start playback timer in integration tests" into rvc-dev am: 7534d9795b am: 089fe5d90b" into rvc-d1-dev-plus-aosp am: a0eb7bfe04 am: f426b9a654 am: 921d55b551
...
Change-Id: I426f35864c7fecf78c287bc0ea6e06a5fc1641ca
2020-05-27 05:17:51 +00:00
TreeHugger Robot
165e54e2e7
Merge "The Entitlement key map was not being cleaned up." into rvc-dev am: bd8e573e0c am: 5bedd9c4ad am: fbd9ca7eca am: abb27ddfcd am: 3c7845e738
...
Change-Id: I3e279f515ff084ad678b56bb2cc9314aa1c13efe
2020-05-27 05:17:45 +00:00
TreeHugger Robot
c17071532e
Merge "The Entitlement key map was not being cleaned up." into rvc-dev am: bd8e573e0c am: 5bedd9c4ad am: 2308e673b2 am: 743f9971b8 am: 579cbdee6a
...
Change-Id: I99bbaf70db3606ee46a9d97ecae636bc6be8dc94
2020-05-27 05:17:31 +00:00
TreeHugger Robot
1a5b4f10d6
Merge "Start playback timer in integration tests" into rvc-dev am: 7534d9795b am: 208a088e8e am: 55a8c8742a am: 5c24259ece am: 34ce2e765a
...
Change-Id: If364d63a3cbfc147f6d7c5135813c4313936c4af
2020-05-27 05:17:00 +00:00
TreeHugger Robot
816f989bea
Merge "Start playback timer in integration tests" into rvc-dev am: 7534d9795b am: 208a088e8e am: 3889252bfc am: 2379c7664a am: a34288e1fe
...
Change-Id: I369e3216fc45cd66539e265df59e625409526ecd
2020-05-27 05:16:13 +00:00
TreeHugger Robot
0acdd25a3f
Merge "The Entitlement key map was not being cleaned up." into rvc-dev am: bd8e573e0c am: a22fc9fa8e am: 549a259ef9 am: 97ce58fdb6
...
Change-Id: I3ad608bffc37610c97ea3680ab371414b3b877b2
2020-05-27 05:01:14 +00:00
Automerger Merge Worker
921d55b551
Merge "Merge "Start playback timer in integration tests" into rvc-dev am: 7534d9795b am: 089fe5d90b" into rvc-d1-dev-plus-aosp am: a0eb7bfe04 am: f426b9a654
...
Change-Id: I7db894251c7eb3aaabc0c216fe6f4bda3e122679
2020-05-27 05:01:08 +00:00
TreeHugger Robot
3c7845e738
Merge "The Entitlement key map was not being cleaned up." into rvc-dev am: bd8e573e0c am: 5bedd9c4ad am: fbd9ca7eca am: abb27ddfcd
...
Change-Id: Ibeb210572beb10d23bc3d71abc31d2514c526891
2020-05-27 05:01:01 +00:00
TreeHugger Robot
579cbdee6a
Merge "The Entitlement key map was not being cleaned up." into rvc-dev am: bd8e573e0c am: 5bedd9c4ad am: 2308e673b2 am: 743f9971b8
...
Change-Id: I982fd0461d3efbcb24de944ab220d93596153b49
2020-05-27 05:00:46 +00:00
TreeHugger Robot
34ce2e765a
Merge "Start playback timer in integration tests" into rvc-dev am: 7534d9795b am: 208a088e8e am: 55a8c8742a am: 5c24259ece
...
Change-Id: I216b0887cc7294d2db65159107d760c9967c9f56
2020-05-27 05:00:02 +00:00
TreeHugger Robot
a34288e1fe
Merge "Start playback timer in integration tests" into rvc-dev am: 7534d9795b am: 208a088e8e am: 3889252bfc am: 2379c7664a
...
Change-Id: I47ac491d8c5097d7372bcab1ca6667a48a8f01d8
2020-05-27 04:58:58 +00:00
TreeHugger Robot
97ce58fdb6
Merge "The Entitlement key map was not being cleaned up." into rvc-dev am: bd8e573e0c am: a22fc9fa8e am: 549a259ef9
...
Change-Id: I70bba32884ed67ad8a798e7d50b5deddc6541966
2020-05-27 04:36:25 +00:00
