OSDN Git Service
android-build-team Robot [Thu, 3 May 2018 22:36:11 +0000 (22:36 +0000)]
Merge changes from topic "am-
01dfab30-af7a-4b8d-97d8-
55bde12588f9" into oc-dev
* changes:
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
984dfe074c am:
8fbe4bce1e am:
0cd0cef08f skipped:
365fb1c844 am:
1839e70cda am:
cdc99a0e87 am:
f145e8172c am:
d72de1bde1 skipped:
2005cc7070
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
984dfe074c am:
8fbe4bce1e am:
0cd0cef08f skipped:
365fb1c844 am:
1839e70cda am:
cdc99a0e87 am:
f145e8172c am:
d72de1bde1
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
984dfe074c am:
8fbe4bce1e am:
0cd0cef08f skipped:
365fb1c844 am:
1839e70cda am:
cdc99a0e87 am:
f145e8172c
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
984dfe074c am:
8fbe4bce1e am:
0cd0cef08f skipped:
365fb1c844 am:
1839e70cda am:
cdc99a0e87
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
984dfe074c am:
8fbe4bce1e am:
0cd0cef08f skipped:
365fb1c844 am:
1839e70cda
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
984dfe074c am:
8fbe4bce1e am:
0cd0cef08f skipped:
365fb1c844
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
984dfe074c am:
8fbe4bce1e am:
0cd0cef08f
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
984dfe074c am:
8fbe4bce1e
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
984dfe074c
DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name
android-build-team Robot [Mon, 30 Apr 2018 22:17:01 +0000 (22:17 +0000)]
Merge "Fix broken check for TelephonyManager#getForbiddenPlmns" into oc-dev
Android Build Merger (Role) [Thu, 26 Apr 2018 21:19:08 +0000 (21:19 +0000)]
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
984dfe074c am:
8fbe4bce1e am:
0cd0cef08f skipped:
365fb1c844 am:
1839e70cda am:
cdc99a0e87 am:
f145e8172c am:
d72de1bde1 skipped:
2005cc7070
Change-Id: I1f1bde1d068339077f793eb1c66dc66dc73465b3
Android Build Merger (Role) [Thu, 26 Apr 2018 21:19:02 +0000 (21:19 +0000)]
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
984dfe074c am:
8fbe4bce1e am:
0cd0cef08f skipped:
365fb1c844 am:
1839e70cda am:
cdc99a0e87 am:
f145e8172c am:
d72de1bde1
Change-Id: Ie77705fa3dbe32da614f664393624829bc82c3ea
Android Build Merger (Role) [Thu, 26 Apr 2018 21:18:57 +0000 (21:18 +0000)]
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
984dfe074c am:
8fbe4bce1e am:
0cd0cef08f skipped:
365fb1c844 am:
1839e70cda am:
cdc99a0e87 am:
f145e8172c
Change-Id: I92b07540faa277e95bd832196589d42e8e405eda
Android Build Merger (Role) [Thu, 26 Apr 2018 21:18:51 +0000 (21:18 +0000)]
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
984dfe074c am:
8fbe4bce1e am:
0cd0cef08f skipped:
365fb1c844 am:
1839e70cda am:
cdc99a0e87
Change-Id: I1aa2ecc6c3d344a5889edc10401515178620d42b
Android Build Merger (Role) [Thu, 26 Apr 2018 21:18:45 +0000 (21:18 +0000)]
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
984dfe074c am:
8fbe4bce1e am:
0cd0cef08f skipped:
365fb1c844 am:
1839e70cda
Change-Id: I264e7ffed376146303f48c01b57fad6d2fe8e19a
Android Build Merger (Role) [Thu, 26 Apr 2018 21:18:32 +0000 (21:18 +0000)]
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
984dfe074c am:
8fbe4bce1e am:
0cd0cef08f skipped:
365fb1c844
Change-Id: I2d42a069fb0b4bae27b8e29e1182e2935c604835
Android Build Merger (Role) [Thu, 26 Apr 2018 21:18:27 +0000 (21:18 +0000)]
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
984dfe074c am:
8fbe4bce1e am:
0cd0cef08f
Change-Id: I937e2d9a676b38f6a18cda70f42d06eaa22ce051
Android Build Merger (Role) [Thu, 26 Apr 2018 21:18:21 +0000 (21:18 +0000)]
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
984dfe074c am:
8fbe4bce1e
Change-Id: If7693b2ff5785a1a09920061b318aaac33f5d6b6
Android Build Merger (Role) [Thu, 26 Apr 2018 21:18:14 +0000 (21:18 +0000)]
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
984dfe074c
Change-Id: Iac403f5118d55d9919745d98eba260dd2929d56c
Hansong Zhang [Thu, 26 Apr 2018 21:13:45 +0000 (14:13 -0700)]
DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name
Test: manual
Bug:
73173182
Change-Id: I3c25af233742e63351a68e8c5a279b51a94e49e2
sqian [Sat, 14 Apr 2018 00:10:05 +0000 (17:10 -0700)]
Fix broken check for TelephonyManager#getForbiddenPlmns
(backport from a fix merged in pi-dev)
Bug:
73884967
Test: Treehugger
Change-Id: I9deaae20893184cde36dcd936fe83708fa60b830
Merged-In: I0cf7920e138892fbcab71fae0eed1293f0b2e404
Merged-In: I9e3456e5f1e479b0e2b102f6c90db57cd0e977fe
Bill Yi [Mon, 16 Apr 2018 18:43:55 +0000 (18:43 +0000)]
Merge changes from topic "am-
281eb700-c15a-44d3-a49f-
153f9323e62a" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
c425155ab8 skipped:
b230479553
[automerger skipped] Import translations. DO NOT MERGE skipped:
c425155ab8
Import translations. DO NOT MERGE
Bill Yi [Mon, 16 Apr 2018 18:43:55 +0000 (18:43 +0000)]
Merge changes from topic "am-
281eb700-c15a-44d3-a49f-
153f9323e62a" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
c425155ab8
Import translations. DO NOT MERGE
Bill Yi [Mon, 16 Apr 2018 18:43:55 +0000 (18:43 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Mon, 16 Apr 2018 18:43:24 +0000 (18:43 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Android Build Merger (Role) [Mon, 16 Apr 2018 18:42:53 +0000 (18:42 +0000)]
[automerger] Import translations. DO NOT MERGE am:
ba2da34cdf skipped:
9812374054
Change-Id: I7cb9fde2607bd5cf254218df7922c552f200d425
Android Build Merger (Role) [Mon, 16 Apr 2018 18:42:48 +0000 (18:42 +0000)]
[automerger] Import translations. DO NOT MERGE am:
ba2da34cdf
Change-Id: Ic48e117b51a8f0d3c2f9a45536b4f85f9100b43e
Bill Yi [Mon, 16 Apr 2018 18:39:49 +0000 (18:39 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Android Build Merger (Role) [Mon, 16 Apr 2018 18:39:14 +0000 (18:39 +0000)]
[automerger] Import translations. DO NOT MERGE am:
aaf2bd3c6d skipped:
8383370425
Change-Id: Id86be4edea769f62ae4dd3de5a21a6fe8471151d
Android Build Merger (Role) [Mon, 16 Apr 2018 18:39:09 +0000 (18:39 +0000)]
[automerger] Import translations. DO NOT MERGE am:
aaf2bd3c6d
Change-Id: I1a5a8473bb77a315ce84e2656e5640488ecb7881
Bill Yi [Mon, 16 Apr 2018 18:33:52 +0000 (18:33 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Android Build Merger (Role) [Mon, 16 Apr 2018 18:33:00 +0000 (18:33 +0000)]
[automerger] Import translations. DO NOT MERGE am:
c7fe3a5972 skipped:
9a64c59288
Change-Id: Iaf447a22df4ace00079a63066b0dcadce145443b
Android Build Merger (Role) [Mon, 16 Apr 2018 18:32:54 +0000 (18:32 +0000)]
[automerger] Import translations. DO NOT MERGE am:
c7fe3a5972
Change-Id: I9ec7fb1d5c5657b8b4936303d39fbecff498eb46
Android Build Merger (Role) [Mon, 16 Apr 2018 17:38:05 +0000 (17:38 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c425155ab8 skipped:
b230479553
Change-Id: Ia7cd12b4e564df81716a199c23e0566a7d263e32
TreeHugger Robot [Sun, 15 Apr 2018 23:54:46 +0000 (23:54 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Android Build Merger (Role) [Sat, 14 Apr 2018 23:05:14 +0000 (23:05 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9b8bceedc2 skipped:
1789ac6b28
Change-Id: I07cc5ff54cd477b8ea8ff6a448f7bd3622a9eb8d
Android Build Merger (Role) [Sat, 14 Apr 2018 23:05:09 +0000 (23:05 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9b8bceedc2
Change-Id: Iaceae5c38f84ffe2ec85ea9b7219da86a857487c
Bill Yi [Sat, 14 Apr 2018 23:04:25 +0000 (16:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: I81ee67e251052ffde639e2cef623bce67b81d4f2
Auto-generated-cl: translation import
Android Build Merger (Role) [Sat, 14 Apr 2018 22:07:15 +0000 (22:07 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c425155ab8
Change-Id: Id2549c7e1686f34666745e21392e1a7260887d69
Bill Yi [Sat, 14 Apr 2018 22:06:42 +0000 (15:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: I325626393f7c9aaa848bec773997db66ad99cfbb
Auto-generated-cl: translation import
Bill Yi [Sat, 14 Apr 2018 21:59:57 +0000 (14:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idbd724355ebbab64d4f4a8948607c0fd5e492ef1
Auto-generated-cl: translation import
Bill Yi [Sat, 14 Apr 2018 21:35:24 +0000 (14:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I959e7781b8d82fcce095a81698f1f4a9a0fddbc4
Auto-generated-cl: translation import
Bill Yi [Sat, 14 Apr 2018 21:00:11 +0000 (14:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5d954e7efdb153eb01f0d8f68d483a6e1e5af0f8
Auto-generated-cl: translation import
TreeHugger Robot [Sat, 14 Apr 2018 02:21:07 +0000 (02:21 +0000)]
Merge changes from topic "ClearGrantIfGroupChanged-nyc" into nyc-mr1-dev
* changes:
[automerger] DO NOT MERGE (N) Revoke permision when group changed am:
5aee569627 am:
419b357806
[automerger] DO NOT MERGE (N) Revoke permision when group changed am:
5aee569627
DO NOT MERGE (N) Revoke permision when group changed
TreeHugger Robot [Sat, 14 Apr 2018 02:21:07 +0000 (02:21 +0000)]
Merge changes from topic "ClearGrantIfGroupChanged-nyc" into nyc-dr1-dev
* changes:
[automerger] DO NOT MERGE (N) Revoke permision when group changed am:
5aee569627
DO NOT MERGE (N) Revoke permision when group changed
TreeHugger Robot [Sat, 14 Apr 2018 02:21:07 +0000 (02:21 +0000)]
Merge "DO NOT MERGE (N) Revoke permision when group changed" into nyc-dev
TreeHugger Robot [Sat, 14 Apr 2018 02:21:07 +0000 (02:21 +0000)]
Merge changes from topic "ClearGrantIfGroupChanged-nyc" into cw-f-dev
* changes:
[automerger] DO NOT MERGE (N) Revoke permision when group changed am:
5aee569627 am:
419b357806 am:
1111596b93
[automerger] DO NOT MERGE (N) Revoke permision when group changed am:
5aee569627 am:
419b357806
[automerger] DO NOT MERGE (N) Revoke permision when group changed am:
5aee569627
DO NOT MERGE (N) Revoke permision when group changed
TreeHugger Robot [Sat, 14 Apr 2018 02:21:07 +0000 (02:21 +0000)]
Merge changes from topic "ClearGrantIfGroupChanged-nyc" into oc-dev
* changes:
[automerger] DO NOT MERGE (N) Revoke permision when group changed am:
5aee569627 am:
419b357806 am:
1111596b93 am:
abbad1d1d7 skipped:
f421873d6f
[automerger] DO NOT MERGE (N) Revoke permision when group changed am:
5aee569627 am:
419b357806 am:
1111596b93 am:
abbad1d1d7
[automerger] DO NOT MERGE (N) Revoke permision when group changed am:
5aee569627 am:
419b357806 am:
1111596b93
[automerger] DO NOT MERGE (N) Revoke permision when group changed am:
5aee569627 am:
419b357806
[automerger] DO NOT MERGE (N) Revoke permision when group changed am:
5aee569627
DO NOT MERGE (N) Revoke permision when group changed
TreeHugger Robot [Sat, 14 Apr 2018 02:21:07 +0000 (02:21 +0000)]
Merge changes from topic "ClearGrantIfGroupChanged-nyc" into nyc-mr2-dev
* changes:
[automerger] DO NOT MERGE (N) Revoke permision when group changed am:
5aee569627 am:
419b357806 am:
1111596b93 am:
abbad1d1d7
[automerger] DO NOT MERGE (N) Revoke permision when group changed am:
5aee569627 am:
419b357806 am:
1111596b93
[automerger] DO NOT MERGE (N) Revoke permision when group changed am:
5aee569627 am:
419b357806
[automerger] DO NOT MERGE (N) Revoke permision when group changed am:
5aee569627
DO NOT MERGE (N) Revoke permision when group changed
TreeHugger Robot [Sat, 14 Apr 2018 01:56:10 +0000 (01:56 +0000)]
Merge "DO NOT MERGE (M) Revoke permision when group changed" into mnc-dev
Android Build Merger (Role) [Sat, 14 Apr 2018 01:07:56 +0000 (01:07 +0000)]
[automerger] DO NOT MERGE (M) Revoke permision when group changed am:
d87a1a7d53 am:
5630564178 am:
90cb8f7b6e skipped:
275e6bf1b4 am:
1bbc69d8f5 am:
8dbf706e9f am:
874fe98a8f am:
9b71a72cb0 skipped:
f1776f0805
Change-Id: I18b5a81159834936591727793777557749128589
Android Build Merger (Role) [Sat, 14 Apr 2018 01:07:52 +0000 (01:07 +0000)]
[automerger] DO NOT MERGE (M) Revoke permision when group changed am:
d87a1a7d53 am:
5630564178 am:
90cb8f7b6e skipped:
275e6bf1b4 am:
1bbc69d8f5 am:
8dbf706e9f am:
874fe98a8f am:
9b71a72cb0
Change-Id: Ib6b064e5ea956d7ecd98bb3f7c04bbc43dc783ba
Android Build Merger (Role) [Sat, 14 Apr 2018 01:07:46 +0000 (01:07 +0000)]
[automerger] DO NOT MERGE (M) Revoke permision when group changed am:
d87a1a7d53 am:
5630564178 am:
90cb8f7b6e skipped:
275e6bf1b4 am:
1bbc69d8f5 am:
8dbf706e9f am:
874fe98a8f
Change-Id: Idea79fe96e755a47851bee4779bd1d7f589881f5
Android Build Merger (Role) [Sat, 14 Apr 2018 01:07:41 +0000 (01:07 +0000)]
[automerger] DO NOT MERGE (M) Revoke permision when group changed am:
d87a1a7d53 am:
5630564178 am:
90cb8f7b6e skipped:
275e6bf1b4 am:
1bbc69d8f5 am:
8dbf706e9f
Change-Id: If22b28a0ed93f1ab3fb0380ebc67281591720e24
Android Build Merger (Role) [Sat, 14 Apr 2018 01:07:35 +0000 (01:07 +0000)]
[automerger] DO NOT MERGE (M) Revoke permision when group changed am:
d87a1a7d53 am:
5630564178 am:
90cb8f7b6e skipped:
275e6bf1b4 am:
1bbc69d8f5
Change-Id: I5f5ba660e59867e17a5cd0f8dcfb0afb2f3060da
Android Build Merger (Role) [Sat, 14 Apr 2018 01:07:25 +0000 (01:07 +0000)]
[automerger] DO NOT MERGE (M) Revoke permision when group changed am:
d87a1a7d53 am:
5630564178 am:
90cb8f7b6e skipped:
275e6bf1b4
Change-Id: I40f818e3e3174645c8786263ddbe6428ce927084
Android Build Merger (Role) [Sat, 14 Apr 2018 01:07:19 +0000 (01:07 +0000)]
[automerger] DO NOT MERGE (M) Revoke permision when group changed am:
d87a1a7d53 am:
5630564178 am:
90cb8f7b6e
Change-Id: I12743702ec15b7d92b0197496e8a3426777ed4db
Android Build Merger (Role) [Sat, 14 Apr 2018 01:07:14 +0000 (01:07 +0000)]
[automerger] DO NOT MERGE (M) Revoke permision when group changed am:
d87a1a7d53 am:
5630564178
Change-Id: I5220d4063a27154243b74e7cd43dc8fd8ffdeb51
Android Build Merger (Role) [Sat, 14 Apr 2018 01:07:08 +0000 (01:07 +0000)]
[automerger] DO NOT MERGE (M) Revoke permision when group changed am:
d87a1a7d53
Change-Id: Ie178331d03d590e50a81117498a0f5dabe4d83ae
Philip P. Moltmann [Thu, 12 Apr 2018 23:44:43 +0000 (16:44 -0700)]
DO NOT MERGE (M) Revoke permision when group changed
If a run time permission of a group is already granted we grant the
other permission of the group automatically when requested.
Hence if an already granted permission changed its group during an
update suddenly permission of a potentially not approved group will
get auto-granted.
This is undesirable, hence we revoke the permission during the update
process.
Test: atest android.permission.cts.PermissionGroupChange
Bug:
72710897
Change-Id: Ib2165d1ae53b80455ebe02e07775853e37a2e339
Android Build Merger (Role) [Sat, 14 Apr 2018 01:05:08 +0000 (01:05 +0000)]
[automerger] DO NOT MERGE (N) Revoke permision when group changed am:
5aee569627 am:
419b357806 am:
1111596b93 am:
abbad1d1d7 skipped:
f421873d6f
Change-Id: Ic67fd7dadddf7a727dc075cba0fcfa8db7984512
Android Build Merger (Role) [Sat, 14 Apr 2018 01:05:02 +0000 (01:05 +0000)]
[automerger] DO NOT MERGE (N) Revoke permision when group changed am:
5aee569627 am:
419b357806 am:
1111596b93 am:
abbad1d1d7
Change-Id: I92684e1b95d265795996222d869ab1457a97dbe2
Android Build Merger (Role) [Sat, 14 Apr 2018 01:04:55 +0000 (01:04 +0000)]
[automerger] DO NOT MERGE (N) Revoke permision when group changed am:
5aee569627 am:
419b357806 am:
1111596b93
Change-Id: I31c8e9d69b1234c7e63c8c45385e7bf743a10b7c
Android Build Merger (Role) [Sat, 14 Apr 2018 01:04:49 +0000 (01:04 +0000)]
[automerger] DO NOT MERGE (N) Revoke permision when group changed am:
5aee569627 am:
419b357806
Change-Id: I4253d70e283336dfd52f821d5a649b8caf2bfd01
Android Build Merger (Role) [Sat, 14 Apr 2018 01:04:40 +0000 (01:04 +0000)]
[automerger] DO NOT MERGE (N) Revoke permision when group changed am:
5aee569627
Change-Id: Ib1696ad75e93be83eef20dd016eff2d83462ea92
Philip P. Moltmann [Thu, 12 Apr 2018 20:48:13 +0000 (13:48 -0700)]
DO NOT MERGE (N) Revoke permision when group changed
If a run time permission of a group is already granted we grant the
other permission of the group automatically when requested.
Hence if an already granted permission changed its group during an
update suddenly permission of a potentially not approved group will
get auto-granted.
This is undesirable, hence we revoke the permission during the update
process.
Test: atest android.permission.cts.PermissionGroupChange
Bug:
72710897
Change-Id: Ib2165d1ae53b80455ebe02e07775853e37a2e339
TreeHugger Robot [Sat, 14 Apr 2018 00:35:38 +0000 (00:35 +0000)]
Merge "DO NOT MERGE (O) Revoke permision when group changed" into oc-dev
Android Build Merger (Role) [Fri, 13 Apr 2018 20:35:02 +0000 (20:35 +0000)]
[automerger] ResStringPool: Fix security vulnerability am:
7e54c3f261 am:
98e2d2ec50 am:
24a89da344 am:
d85632ae40 am:
927b3357fa am:
79d0fb2530 am:
a509e771ba am:
80e36faa72 am:
76d71fa910
Change-Id: I971b589190cae708a08dd568290807dff0f75349
Android Build Merger (Role) [Fri, 13 Apr 2018 20:34:58 +0000 (20:34 +0000)]
[automerger] ResStringPool: Fix security vulnerability am:
7e54c3f261 am:
98e2d2ec50 am:
24a89da344 am:
d85632ae40 am:
927b3357fa am:
79d0fb2530 am:
a509e771ba am:
80e36faa72
Change-Id: Ibeb5d99f477048e8715a0d4b093052f3d88445e2
Android Build Merger (Role) [Fri, 13 Apr 2018 20:34:53 +0000 (20:34 +0000)]
[automerger] ResStringPool: Fix security vulnerability am:
7e54c3f261 am:
98e2d2ec50 am:
24a89da344 am:
d85632ae40 am:
927b3357fa am:
79d0fb2530 am:
a509e771ba
Change-Id: I48bf9619571a30e6f5ea5bad503a3805e0821a75
Android Build Merger (Role) [Fri, 13 Apr 2018 20:34:49 +0000 (20:34 +0000)]
[automerger] ResStringPool: Fix security vulnerability am:
7e54c3f261 am:
98e2d2ec50 am:
24a89da344 am:
d85632ae40 am:
927b3357fa am:
79d0fb2530
Change-Id: I068f51adbb0248db232c50bd89fb25ef0d7273a9
Android Build Merger (Role) [Fri, 13 Apr 2018 20:34:44 +0000 (20:34 +0000)]
[automerger] ResStringPool: Fix security vulnerability am:
7e54c3f261 am:
98e2d2ec50 am:
24a89da344 am:
d85632ae40 am:
927b3357fa
Change-Id: I61c158947f3508aab9ef65988267562663c97a21
Android Build Merger (Role) [Fri, 13 Apr 2018 20:34:34 +0000 (20:34 +0000)]
[automerger] ResStringPool: Fix security vulnerability am:
7e54c3f261 am:
98e2d2ec50 am:
24a89da344 am:
d85632ae40
Change-Id: I24a1df41eb29a6ac7e6c67368f07c6702dacf071
Android Build Merger (Role) [Fri, 13 Apr 2018 20:34:29 +0000 (20:34 +0000)]
[automerger] ResStringPool: Fix security vulnerability am:
7e54c3f261 am:
98e2d2ec50 am:
24a89da344
Change-Id: Ia175db4206119bed5e1a6b1aeeff72ae86489d38
Android Build Merger (Role) [Fri, 13 Apr 2018 20:34:24 +0000 (20:34 +0000)]
[automerger] ResStringPool: Fix security vulnerability am:
7e54c3f261 am:
98e2d2ec50
Change-Id: I0a5c57b7a50d9221b3be4d193388ac610ba92f73
Android Build Merger (Role) [Fri, 13 Apr 2018 20:34:20 +0000 (20:34 +0000)]
[automerger] ResStringPool: Fix security vulnerability am:
7e54c3f261
Change-Id: I57e2ea2122d22341c43b9b445291cc4b02ec2b11
y [Fri, 6 Apr 2018 00:57:27 +0000 (17:57 -0700)]
ResStringPool: Fix security vulnerability
Adds detection of attacker-modified size and data fields passed to
ResStringPool::setTo(). These attacks are modified apks that AAPT would
not normally generate. In the rare case this occurs, the installation
cannot be allowed to continue.
Bug:
71361168
Bug:
71360999
Test: run cts -m CtsAppSecurityHostTestCases \
-t android.appsecurity.cts.CorruptApkTests
Change-Id: If7eb93a9e723b16c8a0556fc4e20006aa0391d57
Merged-In: If7eb93a9e723b16c8a0556fc4e20006aa0391d57
Philip P. Moltmann [Thu, 12 Apr 2018 21:45:14 +0000 (14:45 -0700)]
DO NOT MERGE (O) Revoke permision when group changed
If a run time permission of a group is already granted we grant the
other permission of the group automatically when requested.
Hence if an already granted permission changed its group during an
update suddenly permission of a potentially not approved group will
get auto-granted.
This is undesirable, hence we revoke the permission during the update
process.
Test: atest android.permission.cts.PermissionGroupChange
Change-Id: Ib2165d1ae53b80455ebe02e07775853e37a2e339
Fixes:
72710897
akirilov [Tue, 27 Mar 2018 20:08:47 +0000 (13:08 -0700)]
RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to oc-dev)
Test: added AccessibilityEndToEndTest#testPackageNameCannotBeFaked
cts-tradefed run cts -m CtsAccessibilityServiceTestCases
cts-tradefed run cts -m CtsAccessibilityTestCases
Bug:
69981755
Change-Id: I187e3e9839f654cea9e06e5de93e10e4d1de3109
Merged-In: If3752e106aa7fdee4645dc9852289af471ceff18
Android Build Merger (Role) [Mon, 9 Apr 2018 22:24:32 +0000 (22:24 +0000)]
[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to nyc-dev) am:
33c37cb37c am:
93d9547b61 am:
5ddeef7116 am:
1890afd456 skipped:
bae1ea6478
Change-Id: I67ae802c25bfdaa1a5a7b7bc6880d954e30f3e27
Android Build Merger (Role) [Mon, 9 Apr 2018 22:24:28 +0000 (22:24 +0000)]
[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to nyc-dev) am:
33c37cb37c am:
93d9547b61 am:
5ddeef7116 am:
1890afd456
Change-Id: I1d6b280c14a7a6166221ea0d1448de7bc7feb18c
Android Build Merger (Role) [Mon, 9 Apr 2018 22:24:22 +0000 (22:24 +0000)]
[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to nyc-dev) am:
33c37cb37c am:
93d9547b61 am:
5ddeef7116
Change-Id: Ib3a14de258a548393279940fd3aeb067f2596ca8
Android Build Merger (Role) [Mon, 9 Apr 2018 22:24:16 +0000 (22:24 +0000)]
[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to nyc-dev) am:
33c37cb37c am:
93d9547b61
Change-Id: If515d9ec229e37bdc1368a96ae1f1b474dd50ebe
Android Build Merger (Role) [Mon, 9 Apr 2018 22:24:08 +0000 (22:24 +0000)]
[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to nyc-dev) am:
33c37cb37c
Change-Id: I793b787b6275262f1df6caa9262054e15c94840f
akirilov [Tue, 27 Mar 2018 20:08:47 +0000 (13:08 -0700)]
RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to nyc-dev)
Test: added AccessibilityEndToEndTest#testPackageNameCannotBeFaked
cts-tradefed run cts -m CtsAccessibilityServiceTestCases
cts-tradefed run cts -m CtsAccessibilityTestCases
Bug:
69981755
Change-Id: I187e3e9839f654cea9e06e5de93e10e4d1de3109
Android Build Merger (Role) [Mon, 9 Apr 2018 21:00:57 +0000 (21:00 +0000)]
[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to mnc-dev) am:
de71ee469a am:
d672eef559 am:
86f5488521 skipped:
0df0b30be9 am:
815008072e am:
aa20944ca4 am:
569ad1b287 am:
20a5009e23 skipped:
4fbc80f05b
Change-Id: I31f7f0b24c4abb211837b4143bd17922cbd910a1
Android Build Merger (Role) [Mon, 9 Apr 2018 21:00:53 +0000 (21:00 +0000)]
[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to mnc-dev) am:
de71ee469a am:
d672eef559 am:
86f5488521 skipped:
0df0b30be9 am:
815008072e am:
aa20944ca4 am:
569ad1b287 am:
20a5009e23
Change-Id: Idc5e03ce291191f07f6be769ee777e6dd8f59915
Android Build Merger (Role) [Mon, 9 Apr 2018 21:00:48 +0000 (21:00 +0000)]
[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to mnc-dev) am:
de71ee469a am:
d672eef559 am:
86f5488521 skipped:
0df0b30be9 am:
815008072e am:
aa20944ca4 am:
569ad1b287
Change-Id: I04b6008abff856d7998566a2e9136d62d6ac9c5e
Android Build Merger (Role) [Mon, 9 Apr 2018 21:00:43 +0000 (21:00 +0000)]
[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to mnc-dev) am:
de71ee469a am:
d672eef559 am:
86f5488521 skipped:
0df0b30be9 am:
815008072e am:
aa20944ca4
Change-Id: I4c4a136d4c77b6f1ba869992bb54be2ac755a9f7
Android Build Merger (Role) [Mon, 9 Apr 2018 21:00:38 +0000 (21:00 +0000)]
[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to mnc-dev) am:
de71ee469a am:
d672eef559 am:
86f5488521 skipped:
0df0b30be9 am:
815008072e
Change-Id: Ibbfaf7f47f2471895f7fd5151be1230de51ff258
Android Build Merger (Role) [Mon, 9 Apr 2018 21:00:26 +0000 (21:00 +0000)]
[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to mnc-dev) am:
de71ee469a am:
d672eef559 am:
86f5488521 skipped:
0df0b30be9
Change-Id: Idc789e68b33b1f8fd841204ce9ffb4b988f9c553
Android Build Merger (Role) [Mon, 9 Apr 2018 21:00:20 +0000 (21:00 +0000)]
[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to mnc-dev) am:
de71ee469a am:
d672eef559 am:
86f5488521
Change-Id: I9f6c6fedfdc987a2acf1978a71fb0bdcd034e9e0
Android Build Merger (Role) [Mon, 9 Apr 2018 21:00:15 +0000 (21:00 +0000)]
[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to mnc-dev) am:
de71ee469a am:
d672eef559
Change-Id: Ib50692050fd4e62ad80f24531818a378c75dfe25
Android Build Merger (Role) [Mon, 9 Apr 2018 21:00:08 +0000 (21:00 +0000)]
[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to mnc-dev) am:
de71ee469a
Change-Id: I000fae45e723679ba44b378a36a85daef20ae96d
akirilov [Thu, 22 Mar 2018 21:01:44 +0000 (14:01 -0700)]
RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to mnc-dev)
Test: added AccessibilityEndToEndTest#testPackageNameCannotBeFaked
cts-tradefed run cts --package android.accessibilityservice
cts-tradefed run cts --package android.accessibility
BUG:
69981755
Change-Id: Id9990ccf1e88cea441f9b8927e849e67a059cfe4
Android Build Merger (Role) [Mon, 9 Apr 2018 20:18:09 +0000 (20:18 +0000)]
[automerger] Fix issue #
27317952: PendingIntent.getIntent() should be protected am:
ae77fa4725 am:
d6b6319286 am:
73fcfd424e am:
cb76e24e62 am:
209f5413a1 am:
f91e527a32 am:
db6d6a2914 am:
42dee597da am:
65b3f30dfe
Change-Id: I37d65e9e885739b3f4a897f9ceabe221534e65f8
Android Build Merger (Role) [Mon, 9 Apr 2018 20:18:03 +0000 (20:18 +0000)]
[automerger] Fix issue #
27317952: PendingIntent.getIntent() should be protected am:
ae77fa4725 am:
d6b6319286 am:
73fcfd424e am:
cb76e24e62 am:
209f5413a1 am:
f91e527a32 am:
db6d6a2914 am:
42dee597da
Change-Id: Ic1cb5a34385d6cbdb2e332fd96b6caf6c53b353b
Android Build Merger (Role) [Mon, 9 Apr 2018 20:17:57 +0000 (20:17 +0000)]
[automerger] Fix issue #
27317952: PendingIntent.getIntent() should be protected am:
ae77fa4725 am:
d6b6319286 am:
73fcfd424e am:
cb76e24e62 am:
209f5413a1 am:
f91e527a32 am:
db6d6a2914
Change-Id: Id6bc4a730ed862e380eb3b396a61999c56d2c679
Android Build Merger (Role) [Mon, 9 Apr 2018 20:17:52 +0000 (20:17 +0000)]
[automerger] Fix issue #
27317952: PendingIntent.getIntent() should be protected am:
ae77fa4725 am:
d6b6319286 am:
73fcfd424e am:
cb76e24e62 am:
209f5413a1 am:
f91e527a32
Change-Id: I4a2e77198d157f52266095338cf118896fb53348
Android Build Merger (Role) [Mon, 9 Apr 2018 20:17:44 +0000 (20:17 +0000)]
[automerger] Fix issue #
27317952: PendingIntent.getIntent() should be protected am:
ae77fa4725 am:
d6b6319286 am:
73fcfd424e am:
cb76e24e62 am:
209f5413a1
Change-Id: I29865f40b20c86a3d13493886cfe818638075fea
Android Build Merger (Role) [Mon, 9 Apr 2018 20:17:24 +0000 (20:17 +0000)]
[automerger] Fix issue #
27317952: PendingIntent.getIntent() should be protected am:
ae77fa4725 am:
d6b6319286 am:
73fcfd424e am:
cb76e24e62
Change-Id: Id581b577b7c21bca96019a0a1b9c4bb3c3abc7f6
Android Build Merger (Role) [Mon, 9 Apr 2018 20:17:15 +0000 (20:17 +0000)]
[automerger] Fix issue #
27317952: PendingIntent.getIntent() should be protected am:
ae77fa4725 am:
d6b6319286 am:
73fcfd424e
Change-Id: I9719266bad39cd58527b0aaeec10b39a1eba3509
Android Build Merger (Role) [Mon, 9 Apr 2018 20:17:09 +0000 (20:17 +0000)]
[automerger] Fix issue #
27317952: PendingIntent.getIntent() should be protected am:
ae77fa4725 am:
d6b6319286
Change-Id: Ic3796cc42e2ce78558fe47cff83e19d1aa52cea1
Android Build Merger (Role) [Mon, 9 Apr 2018 20:16:59 +0000 (20:16 +0000)]
[automerger] Fix issue #
27317952: PendingIntent.getIntent() should be protected am:
ae77fa4725
Change-Id: Ic2e2b8d07e1f9872189282923114846db3b3c94c
Dianne Hackborn [Tue, 1 Mar 2016 02:02:43 +0000 (18:02 -0800)]
Fix issue #
27317952: PendingIntent.getIntent() should be protected
Bug:
64752751
Change-Id: Ib05135cd94f5251942a6fc6df542ed39083f7827
(cherry picked from commit
e5ad41bc022db99c4f6663da0a9e49356c006741)
Fyodor Kupolov [Fri, 16 Mar 2018 19:20:40 +0000 (12:20 -0700)]
Use concrete CREATOR instance for parceling lists
Replaced readTypedArrayList/writeTypedArrayList with
writeTypedList/createTypedArrayList(CREATOR)
Bug:
71508348
Test: CtsAutoFillServiceTestCases pass
Merged-In: I2a8321023b40cc74b7026eb0fb32a9cc5f5543a9
Change-Id: Id17d02e40a4ae567bf2d74d2ea8ba4d8a943bdb7
TreeHugger Robot [Thu, 15 Mar 2018 21:39:46 +0000 (21:39 +0000)]
Merge changes from topic "am-
4832db20-4618-4c51-930c-
c4179c7f0a1b" into nyc-mr2-dev
* changes:
[automerger skipped] DO NOT MERGE: Restoring Network Available Notification to AGnssRil skipped:
3656457fac
DO NOT MERGE: Restoring Network Available Notification to AGnssRil
TreeHugger Robot [Thu, 15 Mar 2018 21:39:46 +0000 (21:39 +0000)]
Merge "DO NOT MERGE: Restoring Network Available Notification to AGnssRil" into cw-f-dev