OSDN Git Service
Android Build Merger (Role) [Tue, 13 Mar 2018 00:25:33 +0000 (00:25 +0000)]
[automerger] Rework thumbnail cleanup am:
0dc23f95a1 skipped:
75767d1e3c am:
6720ea0b94
Change-Id: Ibd9203bd7f91b9d25aaf497239e52e81bf18c295
Android Build Merger (Role) [Tue, 13 Mar 2018 00:25:25 +0000 (00:25 +0000)]
[automerger] Rework thumbnail cleanup am:
0dc23f95a1 skipped:
75767d1e3c
Change-Id: I36851ba644feb11c57aff0fe6bb218f5c6f14be4
Android Build Merger (Role) [Tue, 13 Mar 2018 00:23:52 +0000 (00:23 +0000)]
[automerger] Rework thumbnail cleanup am:
0dc23f95a1
Change-Id: Ia3a740184191990fa43ca705b5eae8ea572fb6c1
Marco Nelissen [Tue, 7 Nov 2017 21:52:02 +0000 (13:52 -0800)]
Rework thumbnail cleanup
Bug:
63766886
Test: ran CTS tests
Change-Id: I1f92bb014e275eafe3f42aef1f8c817f187c6608
Merged-In: I1f92bb014e275eafe3f42aef1f8c817f187c6608
Marco Nelissen [Mon, 12 Mar 2018 21:29:58 +0000 (21:29 +0000)]
Merge changes from topic "thumbnails-nyc-mr1-dev" into cw-f-dev
* changes:
[automerger] Rework thumbnail cleanup am:
82a2a87474
Rework thumbnail cleanup
Marco Nelissen [Mon, 12 Mar 2018 21:29:58 +0000 (21:29 +0000)]
Merge "Rework thumbnail cleanup" into nyc-mr1-dev
Pengquan Meng [Fri, 9 Mar 2018 23:37:01 +0000 (23:37 +0000)]
Merge changes from topic "am-
59911b1f-fa0c-400c-a3f8-
812ac0a8762b" into nyc-dr1-dev
* changes:
[automerger] Fixed Security Vulnerability of DcParamObject am:
8c55a70728 am:
61f84448eb am:
a007cb0734 am:
3b356d5111 am:
a61fe8f6c0
[automerger] Fixed Security Vulnerability of DcParamObject am:
8c55a70728 am:
61f84448eb am:
a007cb0734 am:
3b356d5111
[automerger] Fixed Security Vulnerability of DcParamObject am:
8c55a70728 am:
61f84448eb am:
a007cb0734
[automerger] Fixed Security Vulnerability of DcParamObject am:
8c55a70728 am:
61f84448eb
[automerger] Fixed Security Vulnerability of DcParamObject am:
8c55a70728
Fixed Security Vulnerability of DcParamObject
Pengquan Meng [Fri, 9 Mar 2018 23:37:01 +0000 (23:37 +0000)]
Merge changes from topic "am-
59911b1f-fa0c-400c-a3f8-
812ac0a8762b" into nyc-dev
* changes:
[automerger] Fixed Security Vulnerability of DcParamObject am:
8c55a70728 am:
61f84448eb am:
a007cb0734 am:
3b356d5111
[automerger] Fixed Security Vulnerability of DcParamObject am:
8c55a70728 am:
61f84448eb am:
a007cb0734
[automerger] Fixed Security Vulnerability of DcParamObject am:
8c55a70728 am:
61f84448eb
[automerger] Fixed Security Vulnerability of DcParamObject am:
8c55a70728
Fixed Security Vulnerability of DcParamObject
Pengquan Meng [Fri, 9 Mar 2018 23:37:01 +0000 (23:37 +0000)]
Merge changes from topic "am-
59911b1f-fa0c-400c-a3f8-
812ac0a8762b" into cw-f-dev
* changes:
[automerger] Fixed Security Vulnerability of DcParamObject am:
8c55a70728 am:
61f84448eb am:
a007cb0734 am:
3b356d5111 am:
a61fe8f6c0 am:
3276de21ea am:
bd60a681bf
[automerger] Fixed Security Vulnerability of DcParamObject am:
8c55a70728 am:
61f84448eb am:
a007cb0734 am:
3b356d5111 am:
a61fe8f6c0 am:
3276de21ea
[automerger] Fixed Security Vulnerability of DcParamObject am:
8c55a70728 am:
61f84448eb am:
a007cb0734 am:
3b356d5111 am:
a61fe8f6c0
[automerger] Fixed Security Vulnerability of DcParamObject am:
8c55a70728 am:
61f84448eb am:
a007cb0734 am:
3b356d5111
[automerger] Fixed Security Vulnerability of DcParamObject am:
8c55a70728 am:
61f84448eb am:
a007cb0734
[automerger] Fixed Security Vulnerability of DcParamObject am:
8c55a70728 am:
61f84448eb
[automerger] Fixed Security Vulnerability of DcParamObject am:
8c55a70728
Fixed Security Vulnerability of DcParamObject
Pengquan Meng [Fri, 9 Mar 2018 23:37:01 +0000 (23:37 +0000)]
Merge changes from topic "am-
59911b1f-fa0c-400c-a3f8-
812ac0a8762b" into nyc-mr1-dev
* changes:
[automerger] Fixed Security Vulnerability of DcParamObject am:
8c55a70728 am:
61f84448eb am:
a007cb0734 am:
3b356d5111 am:
a61fe8f6c0 am:
3276de21ea
[automerger] Fixed Security Vulnerability of DcParamObject am:
8c55a70728 am:
61f84448eb am:
a007cb0734 am:
3b356d5111 am:
a61fe8f6c0
[automerger] Fixed Security Vulnerability of DcParamObject am:
8c55a70728 am:
61f84448eb am:
a007cb0734 am:
3b356d5111
[automerger] Fixed Security Vulnerability of DcParamObject am:
8c55a70728 am:
61f84448eb am:
a007cb0734
[automerger] Fixed Security Vulnerability of DcParamObject am:
8c55a70728 am:
61f84448eb
[automerger] Fixed Security Vulnerability of DcParamObject am:
8c55a70728
Fixed Security Vulnerability of DcParamObject
Android Build Merger (Role) [Fri, 9 Mar 2018 20:33:45 +0000 (20:33 +0000)]
[automerger] Rework thumbnail cleanup am:
82a2a87474
Change-Id: Ifbeecd9b3406da6151067987709776adeb807c1f
Marco Nelissen [Tue, 7 Nov 2017 21:52:02 +0000 (13:52 -0800)]
Rework thumbnail cleanup
Bug:
63766886
Test: ran CTS tests
Change-Id: I1f92bb014e275eafe3f42aef1f8c817f187c6608
Merged-In: I1f92bb014e275eafe3f42aef1f8c817f187c6608
Alan Viverette [Fri, 9 Mar 2018 18:43:02 +0000 (18:43 +0000)]
Merge changes from topic "viewpager_state" into nyc-dr1-dev
* changes:
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831 am:
fece305de0 am:
cb362192e8 am:
bc42f76941
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831 am:
fece305de0 am:
cb362192e8
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831 am:
fece305de0
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1
Update internal ViewPager's SavedState to match Support Library version
Alan Viverette [Fri, 9 Mar 2018 18:43:02 +0000 (18:43 +0000)]
Merge changes from topic "viewpager_state" into nyc-dev
* changes:
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831 am:
fece305de0 am:
cb362192e8
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831 am:
fece305de0
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1
Update internal ViewPager's SavedState to match Support Library version
Alan Viverette [Fri, 9 Mar 2018 18:43:02 +0000 (18:43 +0000)]
Merge changes from topic "viewpager_state" into cw-f-dev
* changes:
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831 am:
fece305de0 am:
cb362192e8 am:
bc42f76941 am:
c42091667c am:
aebf5c06df
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831 am:
fece305de0 am:
cb362192e8 am:
bc42f76941 am:
c42091667c
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831 am:
fece305de0 am:
cb362192e8 am:
bc42f76941
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831 am:
fece305de0 am:
cb362192e8
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831 am:
fece305de0
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1
Update internal ViewPager's SavedState to match Support Library version
Alan Viverette [Fri, 9 Mar 2018 18:43:02 +0000 (18:43 +0000)]
Merge changes from topic "viewpager_state" into nyc-mr1-dev
* changes:
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831 am:
fece305de0 am:
cb362192e8 am:
bc42f76941 am:
c42091667c
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831 am:
fece305de0 am:
cb362192e8 am:
bc42f76941
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831 am:
fece305de0 am:
cb362192e8
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831 am:
fece305de0
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1
Update internal ViewPager's SavedState to match Support Library version
Eugene Susla [Fri, 9 Mar 2018 18:42:08 +0000 (18:42 +0000)]
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:
5a28e533fe am:
b91acca082 am:
26aaadd3b5 skipped:
a1ad0de1f7 am:
cf92266ad9
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe am:
b91acca082 am:
26aaadd3b5 skipped:
a1ad0de1f7
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe am:
b91acca082 am:
26aaadd3b5
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe am:
b91acca082
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe
[DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService
Eugene Susla [Fri, 9 Mar 2018 18:42:08 +0000 (18:42 +0000)]
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:
5a28e533fe am:
b91acca082 am:
26aaadd3b5 skipped:
a1ad0de1f7
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe am:
b91acca082 am:
26aaadd3b5
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe am:
b91acca082
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe
[DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService
Eugene Susla [Fri, 9 Mar 2018 18:42:08 +0000 (18:42 +0000)]
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:
5a28e533fe am:
b91acca082 am:
26aaadd3b5 skipped:
a1ad0de1f7 am:
cf92266ad9 am:
773f021348 am:
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
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe am:
b91acca082 am:
26aaadd3b5 skipped:
a1ad0de1f7 am:
cf92266ad9
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe am:
b91acca082 am:
26aaadd3b5 skipped:
a1ad0de1f7
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe am:
b91acca082 am:
26aaadd3b5
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe am:
b91acca082
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe
[DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService
Eugene Susla [Fri, 9 Mar 2018 18:42:08 +0000 (18:42 +0000)]
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:
5a28e533fe am:
b91acca082 am:
26aaadd3b5 skipped:
a1ad0de1f7 am:
cf92266ad9 am:
773f021348
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe am:
b91acca082 am:
26aaadd3b5 skipped:
a1ad0de1f7 am:
cf92266ad9
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe am:
b91acca082 am:
26aaadd3b5 skipped:
a1ad0de1f7
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe am:
b91acca082 am:
26aaadd3b5
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe am:
b91acca082
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe
[DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService
TreeHugger Robot [Fri, 9 Mar 2018 15:01:42 +0000 (15:01 +0000)]
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
[DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids
TreeHugger Robot [Fri, 9 Mar 2018 15:01:42 +0000 (15:01 +0000)]
Merge "[DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids" into nyc-dev
TreeHugger Robot [Fri, 9 Mar 2018 15:01:42 +0000 (15:01 +0000)]
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:
41d8bf1fed am:
595f82f99e am:
3aaa23e1e2
[automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am:
41d8bf1fed am:
595f82f99e
[automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am:
41d8bf1fed
[DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids
TreeHugger Robot [Fri, 9 Mar 2018 15:01:42 +0000 (15:01 +0000)]
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:
41d8bf1fed am:
595f82f99e
[automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am:
41d8bf1fed
[DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids
Android Build Merger (Role) [Fri, 9 Mar 2018 04:19:21 +0000 (04:19 +0000)]
[automerger] Fixed Security Vulnerability of DcParamObject am:
8c55a70728 am:
61f84448eb am:
a007cb0734 am:
3b356d5111 am:
a61fe8f6c0 am:
3276de21ea am:
bd60a681bf
Change-Id: I8ad286f9218753d76d031f20e4f924de82abc5a1
Android Build Merger (Role) [Fri, 9 Mar 2018 04:19:16 +0000 (04:19 +0000)]
[automerger] Fixed Security Vulnerability of DcParamObject am:
8c55a70728 am:
61f84448eb am:
a007cb0734 am:
3b356d5111 am:
a61fe8f6c0 am:
3276de21ea
Change-Id: Ic702e9da64dc5aa8e66db22d72f070140c40bdf6
Android Build Merger (Role) [Fri, 9 Mar 2018 04:19:11 +0000 (04:19 +0000)]
[automerger] Fixed Security Vulnerability of DcParamObject am:
8c55a70728 am:
61f84448eb am:
a007cb0734 am:
3b356d5111 am:
a61fe8f6c0
Change-Id: I9206a21355732e408430ceae77d3095793a04072
Android Build Merger (Role) [Fri, 9 Mar 2018 04:19:00 +0000 (04:19 +0000)]
[automerger] Fixed Security Vulnerability of DcParamObject am:
8c55a70728 am:
61f84448eb am:
a007cb0734 am:
3b356d5111
Change-Id: I96567f3adabce5207b07f71ac3b8fe60944a83f2
Android Build Merger (Role) [Fri, 9 Mar 2018 04:18:55 +0000 (04:18 +0000)]
[automerger] Fixed Security Vulnerability of DcParamObject am:
8c55a70728 am:
61f84448eb am:
a007cb0734
Change-Id: I03d75f7b837fdeafabcf64a8d56e1b1f7af89050
Android Build Merger (Role) [Fri, 9 Mar 2018 04:18:50 +0000 (04:18 +0000)]
[automerger] Fixed Security Vulnerability of DcParamObject am:
8c55a70728 am:
61f84448eb
Change-Id: Ibdad47ba4b4f48341957f1112cf26794ef3af0ac
Android Build Merger (Role) [Fri, 9 Mar 2018 04:18:45 +0000 (04:18 +0000)]
[automerger] Fixed Security Vulnerability of DcParamObject am:
8c55a70728
Change-Id: Ic9cf5392057bfb47945e9a1b06abb19697468610
Pengquan Meng [Fri, 9 Mar 2018 04:08:25 +0000 (20:08 -0800)]
Fixed Security Vulnerability of DcParamObject
The writeToParcel and readFromParcel is not symmetry, fixed it.
Test: no test
Bug:
70721937
Change-Id: I01f6f6b2ab778ee8b638d9b69fe0a6b9aa7ee395
Android Build Merger (Role) [Fri, 9 Mar 2018 00:36:18 +0000 (00:36 +0000)]
[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
Android Build Merger (Role) [Fri, 9 Mar 2018 00:36:13 +0000 (00:36 +0000)]
[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
Android Build Merger (Role) [Fri, 9 Mar 2018 00:36:09 +0000 (00:36 +0000)]
[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
Android Build Merger (Role) [Fri, 9 Mar 2018 00:35:58 +0000 (00:35 +0000)]
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe am:
b91acca082 am:
26aaadd3b5 skipped:
a1ad0de1f7
Change-Id: I0deb776ab86a2dfa512b092072d9e8f1e4d1b900
Android Build Merger (Role) [Fri, 9 Mar 2018 00:35:53 +0000 (00:35 +0000)]
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe am:
b91acca082 am:
26aaadd3b5
Change-Id: Icf7b82e7dfbdebeb382c56e2c1db061abd87a3e9
Android Build Merger (Role) [Fri, 9 Mar 2018 00:35:48 +0000 (00:35 +0000)]
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe am:
b91acca082
Change-Id: I0cbca14aed609ab81556ee1deb72ef1e0e294256
Android Build Merger (Role) [Fri, 9 Mar 2018 00:35:42 +0000 (00:35 +0000)]
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am:
5a28e533fe
Change-Id: I09ac593ade4e725b560384042304f93f451b5be5
Eugene Susla [Thu, 22 Feb 2018 18:39:34 +0000 (10:39 -0800)]
[DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService
Fixes:
73511076,
73311729
Test: presubmit
Change-Id: Ie98f67ffee4744050ac85d8b229370a16a76a194
(cherry picked from commit
726b51a26e9a54b7352aad90ed15edccc44dd60d)
Fyodor Kupolov [Thu, 8 Mar 2018 20:30:06 +0000 (20:30 +0000)]
Merge changes from topic "am-
74e79eb6-59c1-4f9c-a993-
72eeee3859c4" into cw-f-dev
* changes:
[automerger] Verify last array's length in readFromParcel am:
3b8bc2e450 am:
71478241eb am:
e0b5c2d25e
[automerger] Verify last array's length in readFromParcel am:
3b8bc2e450 am:
71478241eb
[automerger] Verify last array's length in readFromParcel am:
3b8bc2e450
Verify last array's length in readFromParcel
TreeHugger Robot [Mon, 5 Mar 2018 17:57:45 +0000 (17:57 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Sat, 3 Mar 2018 05:43:12 +0000 (05:43 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Sat, 3 Mar 2018 05:28:36 +0000 (05:28 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Sat, 3 Mar 2018 05:28:03 +0000 (05:28 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Sat, 3 Mar 2018 05:27:27 +0000 (05:27 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Sat, 3 Mar 2018 00:43:41 +0000 (16:43 -0800)]
Import translations. DO NOT MERGE
Change-Id: I741e6b188e72f4805e0eb34d27b93cdf89cfcad0
Auto-generated-cl: translation import
Bill Yi [Fri, 2 Mar 2018 23:39:30 +0000 (15:39 -0800)]
Import translations. DO NOT MERGE
Change-Id: I823f9d64c30c157bd876f95c1f99ffddb0d88a4c
Auto-generated-cl: translation import
Bill Yi [Fri, 2 Mar 2018 23:33:37 +0000 (15:33 -0800)]
Import translations. DO NOT MERGE
Change-Id: If394c2c84402b8d346f151b66e09337389425e47
Auto-generated-cl: translation import
Bill Yi [Fri, 2 Mar 2018 23:01:39 +0000 (15:01 -0800)]
Import translations. DO NOT MERGE
Change-Id: Icece121527012851ebbde0a78216acd34f7061aa
Auto-generated-cl: translation import
Bill Yi [Fri, 2 Mar 2018 22:39:55 +0000 (14:39 -0800)]
Import translations. DO NOT MERGE
Change-Id: If21d03f82c2a5eafaec39ecf54f05ed51fdacde6
Auto-generated-cl: translation import
Bill Yi [Fri, 2 Mar 2018 22:33:43 +0000 (14:33 -0800)]
Import translations. DO NOT MERGE
Change-Id: I85f7c4a5a3d339acd12260ae4cf7a9f04836d111
Auto-generated-cl: translation import
Android Build Merger (Role) [Wed, 21 Feb 2018 20:27:06 +0000 (20:27 +0000)]
[automerger] Verify last array's length in readFromParcel am:
3b8bc2e450 am:
71478241eb am:
e0b5c2d25e
Change-Id: Ib60d63bcc8769f10a64753f7fccf07c103b35c09
Android Build Merger (Role) [Wed, 21 Feb 2018 20:27:01 +0000 (20:27 +0000)]
[automerger] Verify last array's length in readFromParcel am:
3b8bc2e450 am:
71478241eb
Change-Id: I5fb0625286289c43644612528d25fb3f90f6ec7b
Android Build Merger (Role) [Wed, 21 Feb 2018 20:26:56 +0000 (20:26 +0000)]
[automerger] Verify last array's length in readFromParcel am:
3b8bc2e450
Change-Id: If09aad1fa86dbc5c6223d06f67b81d45660ca2d3
Fyodor Kupolov [Wed, 21 Feb 2018 01:02:35 +0000 (17:02 -0800)]
Verify last array's length in readFromParcel
Length of the last array in readFromParcel should be the same as
value of mNextIndex.
Test: PoC app in the bug
Bug:
73252178
Change-Id: I69f935949e945c3a036b19b4f88684d906079ea5
TreeHugger Robot [Tue, 20 Feb 2018 04:54:20 +0000 (04:54 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Tue, 20 Feb 2018 04:53:51 +0000 (04:53 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Mon, 19 Feb 2018 17:16:47 +0000 (09:16 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2e31731c8393cbcd58b57cc4092d14626e60af8b
Auto-generated-cl: translation import
Bill Yi [Mon, 19 Feb 2018 16:07:44 +0000 (08:07 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1b9d68a390483f6259a7eb05a2e337af617896b6
Auto-generated-cl: translation import
Bill Yi [Mon, 19 Feb 2018 15:08:29 +0000 (07:08 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6076b206d8c838472c2c958d521ece8038e10206
Auto-generated-cl: translation import
Android Build Merger (Role) [Fri, 16 Feb 2018 19:46:09 +0000 (19:46 +0000)]
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831 am:
fece305de0 am:
cb362192e8 am:
bc42f76941 am:
c42091667c am:
aebf5c06df
Change-Id: Iedd1e0502ac237920b24cac81a2540cfcf4c8d87
Android Build Merger (Role) [Fri, 16 Feb 2018 19:46:03 +0000 (19:46 +0000)]
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831 am:
fece305de0 am:
cb362192e8 am:
bc42f76941 am:
c42091667c
Change-Id: Ia150bf95186b1a7acdec0d723d44f33040951f56
Android Build Merger (Role) [Fri, 16 Feb 2018 19:45:57 +0000 (19:45 +0000)]
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831 am:
fece305de0 am:
cb362192e8 am:
bc42f76941
Change-Id: Id69b35c6cc53b6cea1666d724813ae21634c0b4c
Android Build Merger (Role) [Fri, 16 Feb 2018 19:45:41 +0000 (19:45 +0000)]
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831 am:
fece305de0 am:
cb362192e8
Change-Id: Ie379f04b1e570ebc94a9e5c37ab3ddbf469acb93
Android Build Merger (Role) [Fri, 16 Feb 2018 19:45:36 +0000 (19:45 +0000)]
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831 am:
fece305de0
Change-Id: Ie54af74e2ab273be07c4cd73881010ee952997ef
Android Build Merger (Role) [Fri, 16 Feb 2018 19:45:30 +0000 (19:45 +0000)]
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1 am:
4c24e4d831
Change-Id: I33e06bfcad6941fd8845f443991dfbcbd4167348
Android Build Merger (Role) [Fri, 16 Feb 2018 19:45:24 +0000 (19:45 +0000)]
[automerger] Update internal ViewPager's SavedState to match Support Library version am:
187964aca1
Change-Id: Ia2d011a3e2c705e82ab11dbf571f6f52cf05bae8
Alan Viverette [Fri, 16 Feb 2018 18:56:02 +0000 (13:56 -0500)]
Update internal ViewPager's SavedState to match Support Library version
Merged-In: Ic4569b21d8a26a62bba91742b442f0c3ea8bcc9e
Change-Id: I17d085be9ce1a139e75264f1e715df7f565cd41b
Fixes:
71992105
Test: manual
Siyamed Sinir [Thu, 15 Feb 2018 00:14:36 +0000 (00:14 +0000)]
Merge "DO NOT MERGE Fix mTrustManager NPE" into mnc-dev
Android Build Merger (Role) [Thu, 15 Feb 2018 00:06:11 +0000 (00:06 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35 am:
0a2ed3f761 am:
d57766c5b4 am:
fc98290b1f
Change-Id: I27c9d607c6b3b7ae5126a9bb22cdb4ea18963918
Android Build Merger (Role) [Thu, 15 Feb 2018 00:06:07 +0000 (00:06 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35 am:
0a2ed3f761 am:
d57766c5b4
Change-Id: Iac5a694469e6c111f204df6c58446a45cf0ada7c
Android Build Merger (Role) [Thu, 15 Feb 2018 00:06:02 +0000 (00:06 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35 am:
0a2ed3f761
Change-Id: Ie5d077cba11b7b9277f4fbce046e571a01535c3c
Android Build Merger (Role) [Thu, 15 Feb 2018 00:05:54 +0000 (00:05 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35
Change-Id: If169e52215ed3a3428d4ff4e834f635f7b0f30e1
Android Build Merger (Role) [Thu, 15 Feb 2018 00:05:49 +0000 (00:05 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0
Change-Id: I80463ee5315c2672e812659192b227c8271e9113
Android Build Merger (Role) [Thu, 15 Feb 2018 00:05:43 +0000 (00:05 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a
Change-Id: Ic83a666bae330bea031b95233079e1493c02c9b3
Android Build Merger (Role) [Thu, 15 Feb 2018 00:05:38 +0000 (00:05 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3
Change-Id: Ib622af453781a1769e820c10d6ab46c140809c57
Android Build Merger (Role) [Thu, 8 Feb 2018 09:17:17 +0000 (09:17 +0000)]
[automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am:
41d8bf1fed am:
595f82f99e am:
3aaa23e1e2
Change-Id: Id5a58769e3f6ccbff0bd8c51a847af8aeb473769
Android Build Merger (Role) [Thu, 8 Feb 2018 09:17:10 +0000 (09:17 +0000)]
[automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am:
41d8bf1fed am:
595f82f99e
Change-Id: I9d66ecd2520cebe75c583a0f8521972ebd284a3e
Android Build Merger (Role) [Thu, 8 Feb 2018 09:17:03 +0000 (09:17 +0000)]
[automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am:
41d8bf1fed
Change-Id: Ie04a46348908203c23a1b3a29a323a2ffbfbe5b2
Rubin Xu [Thu, 11 Jan 2018 10:59:19 +0000 (10:59 +0000)]
[DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids
Bug:
63000005
Test: runtest frameworks-net -c com.android.server.connectivity.VpnTest
Test: cts-tradefed run cts-dev -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.MixedDeviceOwnerTest#testAlwaysOnVpnLockDown
Change-Id: Ia1a82ee73d8617f3124032986fe6c09c14bf7752
Android Build Merger (Role) [Thu, 8 Feb 2018 00:27:17 +0000 (00:27 +0000)]
Merge "Merge changes from topic "am-
ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am:
50d4e94767" into cw-f-dev
Etan Cohen [Thu, 8 Feb 2018 00:26:07 +0000 (00:26 +0000)]
Merge changes from topic "am-
ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev
am:
50d4e94767
Change-Id: I05fe6580c2bf6a44f5fadda55fa5b2d944d9be9e
Android Build Merger (Role) [Thu, 8 Feb 2018 00:16:33 +0000 (00:16 +0000)]
[automerger] Merge changes from topic "am-
513301705eec406eb3be13d14037bb53" into nyc-dev am:
fa72a625cc am:
cdc187ee10 am:
363b273e9a
Change-Id: Idafe9ec60693bf6ffaa3aa7833869261a416d4c1
Android Build Merger (Role) [Thu, 8 Feb 2018 00:16:09 +0000 (00:16 +0000)]
[automerger] Merge changes from topic "am-
513301705eec406eb3be13d14037bb53" into nyc-dev am:
fa72a625cc am:
cdc187ee10
Change-Id: I75f04f568669d0a09e7b492cc2cbcad8bd80389b
Etan Cohen [Thu, 8 Feb 2018 00:15:28 +0000 (00:15 +0000)]
Merge changes from topic "am-
513301705eec406eb3be13d14037bb53" into nyc-dev
am:
fa72a625cc
Change-Id: I99bcbd911edac1d5089e510b888c665f02dc881c
Etan Cohen [Thu, 8 Feb 2018 00:07:01 +0000 (00:07 +0000)]
Merge changes from topic "am-
513301705eec406eb3be13d14037bb53" into nyc-mr1-dev
am:
bd629f69ed
Change-Id: I23b5db36cb5d4d72a23894e75e36ad483ad23338
Android Build Merger (Role) [Wed, 7 Feb 2018 23:50:21 +0000 (23:50 +0000)]
Merge "Merge "Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into nyc-dr1-dev am:
c157934e61" into nyc-mr1-dev am:
f4ea18a058" into cw-f-dev
Android Build Merger (Role) [Wed, 7 Feb 2018 23:49:05 +0000 (23:49 +0000)]
Merge "Merge changes from topic "am-
9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am:
4feca3b99f" into nyc-mr1-dev
Android Build Merger (Role) [Wed, 7 Feb 2018 23:49:05 +0000 (23:49 +0000)]
Merge changes from topic "am-
02bffa5d2f4a4860b898fa67a751a8f5" into cw-f-dev
* changes:
[automerger] Merge changes from topic "am-
9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am:
4feca3b99f am:
b164f1dce0
Merge changes from topic "am-
9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am:
4feca3b99f
Etan Cohen [Wed, 7 Feb 2018 23:47:23 +0000 (23:47 +0000)]
Merge "Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into nyc-dr1-dev am:
c157934e61" into nyc-mr1-dev
am:
f4ea18a058
Change-Id: I98fb6d1b1d7020d7ed057454754d1f1f6000fec6
Android Build Merger (Role) [Wed, 7 Feb 2018 23:46:50 +0000 (23:46 +0000)]
Merge changes from topic "am-
ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev
* changes:
[automerger] Merge changes from topic "am-
9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am:
47f4b8411f am:
e1ea5d3df1
Merge changes from topic "am-
9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am:
47f4b8411f
Android Build Merger (Role) [Wed, 7 Feb 2018 23:46:50 +0000 (23:46 +0000)]
Merge "Merge changes from topic "am-
9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am:
47f4b8411f" into nyc-dr1-dev
Android Build Merger (Role) [Wed, 7 Feb 2018 23:46:50 +0000 (23:46 +0000)]
Merge changes from topic "am-
ef8b8c56c2ad450fb6fab355f35597b0" into cw-f-dev
* changes:
[automerger] Merge changes from topic "am-
9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am:
47f4b8411f am:
e1ea5d3df1 am:
6f10ae56a2
[automerger] Merge changes from topic "am-
9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am:
47f4b8411f am:
e1ea5d3df1
Merge changes from topic "am-
9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am:
47f4b8411f
Android Build Merger (Role) [Wed, 7 Feb 2018 23:46:33 +0000 (23:46 +0000)]
[automerger] Merge changes from topic "am-
9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am:
4feca3b99f am:
b164f1dce0
Change-Id: Iee5a04cf07d706faad6ea0a987d48feb10c504f1
Etan Cohen [Wed, 7 Feb 2018 23:45:55 +0000 (23:45 +0000)]
Merge changes from topic "am-
9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev
am:
4feca3b99f
Change-Id: Id02665871c6b93b03fa1294278e3cb8513811b5e
Android Build Merger (Role) [Wed, 7 Feb 2018 23:45:24 +0000 (23:45 +0000)]
[automerger] Merge changes from topic "am-
9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am:
47f4b8411f am:
e1ea5d3df1 am:
6f10ae56a2
Change-Id: I719bed29c66b873461642fbd3815a993d59720f2
Android Build Merger (Role) [Wed, 7 Feb 2018 23:45:18 +0000 (23:45 +0000)]
Merge changes from topic "am-
513301705eec406eb3be13d14037bb53" into nyc-dev
* changes:
[automerger] Merge "Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev am:
0153ac9dad" into cw-e-dev am:
84118c127f am:
c975948988
Merge "Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev am:
0153ac9dad" into cw-e-dev am:
84118c127f
Android Build Merger (Role) [Wed, 7 Feb 2018 23:45:18 +0000 (23:45 +0000)]
Merge changes from topic "am-
513301705eec406eb3be13d14037bb53" into nyc-mr1-dev
* changes:
[automerger] Merge "Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev am:
0153ac9dad" into cw-e-dev am:
84118c127f am:
c975948988 am:
b8abffa008 am:
74c421f08a
[automerger] Merge "Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev am:
0153ac9dad" into cw-e-dev am:
84118c127f am:
c975948988 am:
b8abffa008
[automerger] Merge "Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev am:
0153ac9dad" into cw-e-dev am:
84118c127f am:
c975948988
Merge "Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev am:
0153ac9dad" into cw-e-dev am:
84118c127f
Android Build Merger (Role) [Wed, 7 Feb 2018 23:45:18 +0000 (23:45 +0000)]
Merge changes from topic "am-
513301705eec406eb3be13d14037bb53" into nyc-dr1-dev
* changes:
[automerger] Merge "Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev am:
0153ac9dad" into cw-e-dev am:
84118c127f am:
c975948988 am:
b8abffa008
[automerger] Merge "Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev am:
0153ac9dad" into cw-e-dev am:
84118c127f am:
c975948988
Merge "Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev am:
0153ac9dad" into cw-e-dev am:
84118c127f
OSDN Git Service
