Android Build Merger (Role)
d08bb4b174
[automerger] Rework thumbnail cleanup am: 0dc23f95a1 skipped: 75767d1e3c am: 6720ea0b94 am: 16ee12ac68
...
Change-Id: If81e264d57c533a12e270c197e99a31c895fa2dd
2018-03-13 00:25:44 +00:00
Android Build Merger (Role)
16ee12ac68
[automerger] Rework thumbnail cleanup am: 0dc23f95a1 skipped: 75767d1e3c am: 6720ea0b94
...
Change-Id: Ibd9203bd7f91b9d25aaf497239e52e81bf18c295
2018-03-13 00:25:33 +00:00
Android Build Merger (Role)
6720ea0b94
[automerger] Rework thumbnail cleanup am: 0dc23f95a1 skipped: 75767d1e3c
...
Change-Id: I36851ba644feb11c57aff0fe6bb218f5c6f14be4
2018-03-13 00:25:25 +00:00
Android Build Merger (Role)
75767d1e3c
[automerger] Rework thumbnail cleanup am: 0dc23f95a1
...
Change-Id: Ia3a740184191990fa43ca705b5eae8ea572fb6c1
2018-03-13 00:23:52 +00:00
Marco Nelissen
0dc23f95a1
Rework thumbnail cleanup
...
Bug: 63766886
Test: ran CTS tests
Change-Id: I1f92bb014e275eafe3f42aef1f8c817f187c6608
Merged-In: I1f92bb014e275eafe3f42aef1f8c817f187c6608
2018-03-13 00:23:51 +00:00
Marco Nelissen
9f37972a2c
Merge changes from topic "thumbnails-nyc-mr1-dev" into nyc-mr2-dev
...
* changes:
[automerger] Rework thumbnail cleanup am: 82a2a8747497eb9d056a82a2a87474
2018-03-12 21:29:58 +00:00
Marco Nelissen
f572511047
Merge changes from topic "thumbnails-nyc-mr1-dev" into cw-f-dev
...
* changes:
[automerger] Rework thumbnail cleanup am: 82a2a87474
2018-03-12 21:29:58 +00:00
Marco Nelissen
0d0ff3390d
Merge "Rework thumbnail cleanup" into nyc-mr1-dev
2018-03-12 21:29:58 +00:00
Pengquan Meng
a9399dbc09
Merge changes from topic "am-59911b1f-fa0c-400c-a3f8-812ac0a8762b" into nyc-dr1-dev
...
* changes:
[automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a7072861f84448eba007cb07343b356d5111a61fe8f6c08c55a7072861f84448eba007cb07343b356d51118c55a7072861f84448eba007cb07348c55a7072861f84448eb8c55a70728
2018-03-09 23:37:01 +00:00
Pengquan Meng
80a84c4aad
Merge changes from topic "am-59911b1f-fa0c-400c-a3f8-812ac0a8762b" into nyc-dev
...
* changes:
[automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a7072861f84448eba007cb07343b356d51118c55a7072861f84448eba007cb07348c55a7072861f84448eb8c55a70728
2018-03-09 23:37:01 +00:00
Pengquan Meng
a6ef409bbe
Merge changes from topic "am-59911b1f-fa0c-400c-a3f8-812ac0a8762b" into nyc-mr2-dev
...
* changes:
[automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a7072861f84448eba007cb07343b356d5111a61fe8f6c03276de21eabd60a681bf5d5e5ca7cb8c55a7072861f84448eba007cb07343b356d5111a61fe8f6c03276de21eabd60a681bf8c55a7072861f84448eba007cb07343b356d5111a61fe8f6c03276de21ea8c55a7072861f84448eba007cb07343b356d5111a61fe8f6c08c55a7072861f84448eba007cb07343b356d51118c55a7072861f84448eba007cb07348c55a7072861f84448eb8c55a70728
2018-03-09 23:37:01 +00:00
Pengquan Meng
f6a3a0b079
Merge changes from topic "am-59911b1f-fa0c-400c-a3f8-812ac0a8762b" into cw-f-dev
...
* changes:
[automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a7072861f84448eba007cb07343b356d5111a61fe8f6c03276de21eabd60a681bf8c55a7072861f84448eba007cb07343b356d5111a61fe8f6c03276de21ea8c55a7072861f84448eba007cb07343b356d5111a61fe8f6c08c55a7072861f84448eba007cb07343b356d51118c55a7072861f84448eba007cb07348c55a7072861f84448eb8c55a70728
2018-03-09 23:37:01 +00:00
Pengquan Meng
53411e5153
Merge changes from topic "am-59911b1f-fa0c-400c-a3f8-812ac0a8762b" into nyc-mr1-dev
...
* changes:
[automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a7072861f84448eba007cb07343b356d5111a61fe8f6c03276de21ea8c55a7072861f84448eba007cb07343b356d5111a61fe8f6c08c55a7072861f84448eba007cb07343b356d51118c55a7072861f84448eba007cb07348c55a7072861f84448eb8c55a70728
2018-03-09 23:37:01 +00:00
Android Build Merger (Role)
cb9dd5d0e6
[automerger] Rework thumbnail cleanup am: 82a2a87474 am: 97eb9d056a
...
Change-Id: Id58fd0db50cf10dd0af21464259e7a6e366edecd
2018-03-09 20:33:52 +00:00
Android Build Merger (Role)
97eb9d056a
[automerger] Rework thumbnail cleanup am: 82a2a87474
...
Change-Id: Ifbeecd9b3406da6151067987709776adeb807c1f
2018-03-09 20:33:45 +00:00
Marco Nelissen
82a2a87474
Rework thumbnail cleanup
...
Bug: 63766886
Test: ran CTS tests
Change-Id: I1f92bb014e275eafe3f42aef1f8c817f187c6608
Merged-In: I1f92bb014e275eafe3f42aef1f8c817f187c6608
2018-03-09 20:33:30 +00:00
Alan Viverette
b857f46bfb
Merge changes from topic "viewpager_state" into nyc-dr1-dev
...
* changes:
[automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca14c24e4d831fece305de0cb362192e8bc42f76941187964aca14c24e4d831fece305de0cb362192e8187964aca14c24e4d831fece305de0187964aca14c24e4d831187964aca1
2018-03-09 18:43:02 +00:00
Alan Viverette
2c72729428
Merge changes from topic "viewpager_state" into nyc-dev
...
* changes:
[automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca14c24e4d831fece305de0cb362192e8187964aca14c24e4d831fece305de0187964aca14c24e4d831187964aca1
2018-03-09 18:43:02 +00:00
Alan Viverette
60a7e5c442
Merge changes from topic "viewpager_state" into nyc-mr2-dev
...
* changes:
[automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca14c24e4d831fece305de0cb362192e8bc42f76941c42091667caebf5c06dfd04ccc6608187964aca14c24e4d831fece305de0cb362192e8bc42f76941c42091667caebf5c06df187964aca14c24e4d831fece305de0cb362192e8bc42f76941c42091667c187964aca14c24e4d831fece305de0cb362192e8bc42f76941187964aca14c24e4d831fece305de0cb362192e8187964aca14c24e4d831fece305de0187964aca14c24e4d831187964aca1
2018-03-09 18:43:02 +00:00
Alan Viverette
c9bcd43935
Merge changes from topic "viewpager_state" into cw-f-dev
...
* changes:
[automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca14c24e4d831fece305de0cb362192e8bc42f76941c42091667caebf5c06df187964aca14c24e4d831fece305de0cb362192e8bc42f76941c42091667c187964aca14c24e4d831fece305de0cb362192e8bc42f76941187964aca14c24e4d831fece305de0cb362192e8187964aca14c24e4d831fece305de0187964aca14c24e4d831187964aca1
2018-03-09 18:43:02 +00:00
Alan Viverette
04c801cc6a
Merge changes from topic "viewpager_state" into nyc-mr1-dev
...
* changes:
[automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca14c24e4d831fece305de0cb362192e8bc42f76941c42091667c187964aca14c24e4d831fece305de0cb362192e8bc42f76941187964aca14c24e4d831fece305de0cb362192e8187964aca14c24e4d831fece305de0187964aca14c24e4d831187964aca1
2018-03-09 18:43:02 +00:00
Eugene Susla
e02cd061ca
Merge changes from topic "recognition_service-mnc-dev" into nyc-dr1-dev
...
* changes:
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533feb91acca08226aaadd3b5a1ad0de1f7cf92266ad95a28e533feb91acca08226aaadd3b5a1ad0de1f75a28e533feb91acca08226aaadd3b55a28e533feb91acca0825a28e533fe
2018-03-09 18:42:08 +00:00
Eugene Susla
338cb38cad
Merge changes from topic "recognition_service-mnc-dev" into nyc-dev
...
* changes:
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533feb91acca08226aaadd3b5a1ad0de1f75a28e533feb91acca08226aaadd3b55a28e533feb91acca0825a28e533fe
2018-03-09 18:42:08 +00:00
Eugene Susla
94d34781c2
Merge changes from topic "recognition_service-mnc-dev" into nyc-mr2-dev
...
* changes:
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533feb91acca08226aaadd3b5a1ad0de1f7cf92266ad9773f021348bca318e527122f5e51bf5a28e533feb91acca08226aaadd3b5a1ad0de1f7cf92266ad9773f021348bca318e5275a28e533feb91acca08226aaadd3b5a1ad0de1f7cf92266ad9773f0213485a28e533feb91acca08226aaadd3b5a1ad0de1f7cf92266ad95a28e533feb91acca08226aaadd3b5a1ad0de1f75a28e533feb91acca08226aaadd3b55a28e533feb91acca0825a28e533fe
2018-03-09 18:42:08 +00:00
Eugene Susla
1867b0dbec
Merge changes from topic "recognition_service-mnc-dev" into cw-f-dev
...
* changes:
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533feb91acca08226aaadd3b5a1ad0de1f7cf92266ad9773f021348bca318e5275a28e533feb91acca08226aaadd3b5a1ad0de1f7cf92266ad9773f0213485a28e533feb91acca08226aaadd3b5a1ad0de1f7cf92266ad95a28e533feb91acca08226aaadd3b5a1ad0de1f75a28e533feb91acca08226aaadd3b55a28e533feb91acca0825a28e533fe
2018-03-09 18:42:08 +00:00
Eugene Susla
a3644de787
Merge changes from topic "recognition_service-mnc-dev" into nyc-mr1-dev
...
* changes:
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533feb91acca08226aaadd3b5a1ad0de1f7cf92266ad9773f0213485a28e533feb91acca08226aaadd3b5a1ad0de1f7cf92266ad95a28e533feb91acca08226aaadd3b5a1ad0de1f75a28e533feb91acca08226aaadd3b55a28e533feb91acca0825a28e533fe
2018-03-09 18:42:08 +00:00
TreeHugger Robot
fb6e4bc01b
Merge changes from topic "am-af991497-a243-423d-8f58-f6bc1131a734" into nyc-dr1-dev
...
* changes:
[automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am: 41d8bf1fed
2018-03-09 15:01:42 +00:00
TreeHugger Robot
28c7060b11
Merge "[DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids" into nyc-dev
2018-03-09 15:01:42 +00:00
TreeHugger Robot
7df9c20466
Merge changes from topic "am-af991497-a243-423d-8f58-f6bc1131a734" into nyc-mr2-dev
...
* changes:
[automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am: 41d8bf1fed595f82f99e3aaa23e1e24b71619f5041d8bf1fed595f82f99e3aaa23e1e241d8bf1fed595f82f99e41d8bf1fed
2018-03-09 15:01:42 +00:00
TreeHugger Robot
404881ae61
Merge changes from topic "am-af991497-a243-423d-8f58-f6bc1131a734" into cw-f-dev
...
* changes:
[automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am: 41d8bf1fed595f82f99e3aaa23e1e241d8bf1fed595f82f99e41d8bf1fed
2018-03-09 15:01:42 +00:00
TreeHugger Robot
377fd4ea35
Merge changes from topic "am-af991497-a243-423d-8f58-f6bc1131a734" into nyc-mr1-dev
...
* changes:
[automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am: 41d8bf1fed595f82f99e41d8bf1fed
2018-03-09 15:01:42 +00:00
Android Build Merger (Role)
f64ab1e93d
[automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111 am: a61fe8f6c0 am: 3276de21ea am: bd60a681bf am: 5d5e5ca7cb
...
Change-Id: I3bd9d6f3d290ae125d57a4650b41b8ff6cbb5591
2018-03-09 04:19:26 +00:00
Android Build Merger (Role)
5d5e5ca7cb
[automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111 am: a61fe8f6c0 am: 3276de21ea am: bd60a681bf
...
Change-Id: I8ad286f9218753d76d031f20e4f924de82abc5a1
2018-03-09 04:19:21 +00:00
Android Build Merger (Role)
bd60a681bf
[automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111 am: a61fe8f6c0 am: 3276de21ea
...
Change-Id: Ic702e9da64dc5aa8e66db22d72f070140c40bdf6
2018-03-09 04:19:16 +00:00
Android Build Merger (Role)
3276de21ea
[automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111 am: a61fe8f6c0
...
Change-Id: I9206a21355732e408430ceae77d3095793a04072
2018-03-09 04:19:11 +00:00
Android Build Merger (Role)
a61fe8f6c0
[automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111
...
Change-Id: I96567f3adabce5207b07f71ac3b8fe60944a83f2
2018-03-09 04:19:00 +00:00
Android Build Merger (Role)
3b356d5111
[automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734
...
Change-Id: I03d75f7b837fdeafabcf64a8d56e1b1f7af89050
2018-03-09 04:18:55 +00:00
Android Build Merger (Role)
a007cb0734
[automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb
...
Change-Id: Ibdad47ba4b4f48341957f1112cf26794ef3af0ac
2018-03-09 04:18:50 +00:00
Android Build Merger (Role)
61f84448eb
[automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728
...
Change-Id: Ic9cf5392057bfb47945e9a1b06abb19697468610
2018-03-09 04:18:45 +00:00
Pengquan Meng
8c55a70728
Fixed Security Vulnerability of DcParamObject
...
The writeToParcel and readFromParcel is not symmetry, fixed it.
Test: no test
Bug: 70721937
Change-Id: I01f6f6b2ab778ee8b638d9b69fe0a6b9aa7ee395
2018-03-09 04:18:36 +00:00
Android Build Merger (Role)
36e5764193
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082 am: 26aaadd3b5 skipped: a1ad0de1f7 am: cf92266ad9 am: 773f021348 am: bca318e527 am: 122f5e51bf
...
Change-Id: I2038933c4a044b3746d131027368f3b59d63065b
2018-03-09 00:36:23 +00:00
Android Build Merger (Role)
122f5e51bf
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082 am: 26aaadd3b5 skipped: a1ad0de1f7 am: cf92266ad9 am: 773f021348 am: bca318e527
...
Change-Id: I9bf4052c140ca9fc068f8d18b9a92015de9e9f90
2018-03-09 00:36:18 +00:00
Android Build Merger (Role)
bca318e527
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082 am: 26aaadd3b5 skipped: a1ad0de1f7 am: cf92266ad9 am: 773f021348
...
Change-Id: Idde6da0725fe743bb943b0d712782add546d1506
2018-03-09 00:36:13 +00:00
Android Build Merger (Role)
773f021348
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082 am: 26aaadd3b5 skipped: a1ad0de1f7 am: cf92266ad9
...
Change-Id: Id603e54b576e7c5ae6566f5560bd4599b653bf12
2018-03-09 00:36:09 +00:00
Android Build Merger (Role)
cf92266ad9
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082 am: 26aaadd3b5 skipped: a1ad0de1f7
...
Change-Id: I0deb776ab86a2dfa512b092072d9e8f1e4d1b900
2018-03-09 00:35:58 +00:00
Android Build Merger (Role)
a1ad0de1f7
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082 am: 26aaadd3b5
...
Change-Id: Icf7b82e7dfbdebeb382c56e2c1db061abd87a3e9
2018-03-09 00:35:53 +00:00
Android Build Merger (Role)
26aaadd3b5
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082
...
Change-Id: I0cbca14aed609ab81556ee1deb72ef1e0e294256
2018-03-09 00:35:48 +00:00
Android Build Merger (Role)
b91acca082
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe
...
Change-Id: I09ac593ade4e725b560384042304f93f451b5be5
2018-03-09 00:35:42 +00:00
Eugene Susla
5a28e533fe
[DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService
...
Fixes: 73511076, 73311729
Test: presubmit
Change-Id: Ie98f67ffee4744050ac85d8b229370a16a76a194
(cherry picked from commit 726b51a26e
2018-03-09 00:35:39 +00:00
Fyodor Kupolov
923c8d7e35
Merge changes from topic "am-74e79eb6-59c1-4f9c-a993-72eeee3859c4" into nyc-mr2-dev
...
* changes:
[automerger] Verify last array's length in readFromParcel am: 3b8bc2e45071478241ebe0b5c2d25efa32631c633b8bc2e45071478241ebe0b5c2d25e3b8bc2e45071478241eb3b8bc2e450
2018-03-08 20:30:06 +00:00
