OSDN Git Service
android-build-team Robot [Fri, 4 May 2018 00:28:20 +0000 (00:28 +0000)]
Merge "DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name" into oc-mr1-dev
android-build-team Robot [Thu, 3 May 2018 23:43:46 +0000 (16:43 -0700)]
Merge changes from topic "am-
01dfab30-af7a-4b8d-97d8-
55bde12588f9-nyc-dev" into oc-dev am:
96e62bb999
am:
d9a2898a88
Change-Id: I2d4e8373092b33af5cc41287073842b8637b9e9e
android-build-team Robot [Thu, 3 May 2018 23:31:58 +0000 (16:31 -0700)]
Merge changes from topic "am-
01dfab30-af7a-4b8d-97d8-
55bde12588f9-nyc-dev" into oc-dev
am:
96e62bb999
Change-Id: I387591c99f211f3e2399eed316cc1eada3a6b7f5
android-build-team Robot [Thu, 3 May 2018 23:10:52 +0000 (23:10 +0000)]
Merge changes from topic "am-
01dfab30-af7a-4b8d-97d8-
55bde12588f9-nyc-dev" into oc-dev
* changes:
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
b6cde9ecc1 am:
b906043c81 am:
9822117184 am:
2b41ff76b0 skipped:
4eaa691175
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
b6cde9ecc1 am:
b906043c81 am:
9822117184 am:
2b41ff76b0
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
b6cde9ecc1 am:
b906043c81 am:
9822117184
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
b6cde9ecc1 am:
b906043c81
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
b6cde9ecc1
DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name
android-build-team Robot [Thu, 3 May 2018 23:10:17 +0000 (16:10 -0700)]
Merge changes from topic "am-
01dfab30-af7a-4b8d-97d8-
55bde12588f9" into oc-dev am:
a9e5b5dce0
am:
7e01400018
Change-Id: I863476787647ddcb16e5e0587d0c06a755cb0e07
android-build-team Robot [Thu, 3 May 2018 22:56:49 +0000 (15:56 -0700)]
Merge changes from topic "am-
01dfab30-af7a-4b8d-97d8-
55bde12588f9" into oc-dev
am:
a9e5b5dce0
Change-Id: Id8fb16f96cd87b7aeb8cf501a70952e877ac0210
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
Adrian Roos [Wed, 2 May 2018 12:30:35 +0000 (12:30 +0000)]
Fix build more
Bug:
78122614
Test: m checkbuild
Change-Id: Ia69eca72a2982c6417bcd30bf806ef8c18616251
Merged-In: I226622533a1b406ba26c161cba13721080b4baca
Adrian Roos [Mon, 23 Apr 2018 16:54:37 +0000 (18:54 +0200)]
Fix build
Bug:
78122614
Test: m checkbuild
Change-Id: Ifd908fc91dc89d33a2b88fcfaed48480315991c6
Merged-In: I226622533a1b406ba26c161cba13721080b4baca
Adrian Roos [Tue, 20 Mar 2018 13:58:29 +0000 (14:58 +0100)]
OC-MR1 DisplayCutout XML API
Bug:
78122614
Test: m checkbuild
Change-Id: I974d3d4385ba66477e0932d40d0af7bcd32ddfb1
Merged-In: I226622533a1b406ba26c161cba13721080b4baca
android-build-team Robot [Mon, 30 Apr 2018 22:39:15 +0000 (15:39 -0700)]
Merge "Fix broken check for TelephonyManager#getForbiddenPlmns" into oc-dev am:
0a7c41615e
am:
4e0dd1197a
Change-Id: I4b37bce88249278a8b829b90adf679366e417428
android-build-team Robot [Mon, 30 Apr 2018 22:29:19 +0000 (15:29 -0700)]
Merge "Fix broken check for TelephonyManager#getForbiddenPlmns" into oc-dev
am:
0a7c41615e
Change-Id: I259380ed027d31c4b8292f366590f0757f540766
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
Hansong Zhang [Thu, 26 Apr 2018 21:22:39 +0000 (14:22 -0700)]
DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name
Test: manual
Bug:
73173182
Change-Id: I7f2201cab36adf7f01d1a794d783cb78a536811f
Android Build Merger (Role) [Thu, 26 Apr 2018 21:19:09 +0000 (21:19 +0000)]
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
b6cde9ecc1 am:
b906043c81 am:
9822117184 am:
2b41ff76b0 skipped:
4eaa691175
Change-Id: I6b6efc3f1188408a00519655b85b0f711bd64a3e
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:03 +0000 (21:19 +0000)]
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
b6cde9ecc1 am:
b906043c81 am:
9822117184 am:
2b41ff76b0
Change-Id: I6e5bf8c2f05f44bc292f4c0ec1fcc885a4a24655
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:58 +0000 (21:18 +0000)]
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
b6cde9ecc1 am:
b906043c81 am:
9822117184
Change-Id: I8e628fee8dd1b9c488aca0ce8f3508c109dd9e18
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:53 +0000 (21:18 +0000)]
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
b6cde9ecc1 am:
b906043c81
Change-Id: I12322ddbacc848912426bacaa49469d6d5982c60
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:47 +0000 (21:18 +0000)]
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
b6cde9ecc1
Change-Id: I3f951fac78c6e2da84eac511d3b0e19141e90153
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
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 19:20:42 +0000 (12:20 -0700)]
Merge changes from topic "am-
281eb700-c15a-44d3-a49f-
153f9323e62a" into oc-dev am:
231719b4d2
am:
60fb81edda
Change-Id: I5933e96aa34fc6aff073513bdb0400fd02796e62
Bill Yi [Mon, 16 Apr 2018 19:16:09 +0000 (12:16 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c425155ab8 skipped:
b230479553 am:
fde5e09eeb -s ours
am:
490f12c8c1 -s ours
Change-Id: I5c1579d596c4f444ebee20cf217c3e4872182d0c
Bill Yi [Mon, 16 Apr 2018 19:14:27 +0000 (12:14 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am:
ba2da34cdf skipped:
9812374054 am:
bfcb8b99a5 -s ours
am:
f62419973f -s ours
Change-Id: I37dbec1d64219b2c2b57da0535364606b527f3f3
Bill Yi [Mon, 16 Apr 2018 19:01:52 +0000 (12:01 -0700)]
Merge changes from topic "am-
281eb700-c15a-44d3-a49f-
153f9323e62a" into oc-dev
am:
231719b4d2
Change-Id: I5186692869d8849e0abc8d60f97970ce07e273aa
Bill Yi [Mon, 16 Apr 2018 19:00:03 +0000 (12:00 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c425155ab8 skipped:
b230479553
am:
fde5e09eeb -s ours
Change-Id: Ife2f1cabaad48b2b89dfe46c6de4f1cfa18c27cc
Bill Yi [Mon, 16 Apr 2018 18:58:54 +0000 (11:58 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am:
aaf2bd3c6d skipped:
8383370425 am:
cb80417eab -s ours
am:
3194fdd40a -s ours
Change-Id: I67f37180a53bdd87975f458ce68ae75890ebec29
Bill Yi [Mon, 16 Apr 2018 18:56:07 +0000 (11:56 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am:
ba2da34cdf skipped:
9812374054
am:
bfcb8b99a5 -s ours
Change-Id: I9573bb5fb938d29fbd40c94bb36203607bacdfee
Bill Yi [Mon, 16 Apr 2018 18:55:52 +0000 (11:55 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am:
c7fe3a5972 skipped:
9a64c59288 am:
67841fe1e6 -s ours
am:
97ddc81da4 -s ours
Change-Id: I0a2be41354fd01b370c95f0f77d67c878bb84d55
Bill Yi [Mon, 16 Apr 2018 18:52:51 +0000 (11:52 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am:
aaf2bd3c6d skipped:
8383370425
am:
cb80417eab -s ours
Change-Id: I29e67171958497655f4d0374b2decbc1429135f7
Bill Yi [Mon, 16 Apr 2018 18:49:23 +0000 (11:49 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am:
c7fe3a5972 skipped:
9a64c59288
am:
67841fe1e6 -s ours
Change-Id: Ic7684c0d86e85aaebfb4e459d4dbd57d0d67d3b9
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
Bill Yi [Mon, 16 Apr 2018 00:08:34 +0000 (17:08 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9b8bceedc2 skipped:
1789ac6b28 am:
d12aff917a -s ours
am:
06e9f9dad5 -s ours
Change-Id: I87341fd783f4e18607921d0023c0a8d9bb2cdaf6
Bill Yi [Mon, 16 Apr 2018 00:03:09 +0000 (17:03 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9b8bceedc2 skipped:
1789ac6b28
am:
d12aff917a -s ours
Change-Id: I7400a1e8da6fde612c5b130228b28cf25ce5b99c
TreeHugger Robot [Sun, 15 Apr 2018 23:54:46 +0000 (23:54 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Philip P. Moltmann [Sun, 15 Apr 2018 00:36:23 +0000 (17:36 -0700)]
Merge changes from topic "ClearGrantIfGroupChanged-nyc" into oc-dev am:
6173fbe12e
am:
6a845fe056
Change-Id: I5aebe2f67ad5f0f748db1b45c2b4ad6a1c4df530
Philip P. Moltmann [Sun, 15 Apr 2018 00:26:51 +0000 (17:26 -0700)]
Merge changes from topic "ClearGrantIfGroupChanged-nyc" into oc-dev
am:
6173fbe12e
Change-Id: I9f8435dbdee7c532c68542e5a1de75e97dfc6dea
Philip P. Moltmann [Sun, 15 Apr 2018 00:25:40 +0000 (17:25 -0700)]
[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 am:
877a845005
am:
885bcab242
Change-Id: Iec02fbfef86e421f0c7b6efc8dd49184bc39a6be
Philip P. Moltmann [Sun, 15 Apr 2018 00:14:53 +0000 (17:14 -0700)]
[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
am:
877a845005
Change-Id: Ifd815fa2dcabe164a7445654ac9f2374c7a7db9e
Philip P. Moltmann [Sat, 14 Apr 2018 23:37:25 +0000 (16:37 -0700)]
Merge "DO NOT MERGE (O) Revoke permision when group changed" into oc-dev am:
cda08919cf
am:
d139755de8
Change-Id: I3607d28823ced42c14d39d99bbfd8ea346cfc835
Philip P. Moltmann [Sat, 14 Apr 2018 23:28:15 +0000 (16:28 -0700)]
Merge "DO NOT MERGE (O) Revoke permision when group changed" into oc-dev
am:
cda08919cf
Change-Id: I949f16944d202078a1f191a1284f1c48a46cbb58
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
Philip P. Moltmann [Sat, 14 Apr 2018 01:09:04 +0000 (01:09 +0000)]
Merge "DO NOT MERGE (O) Revoke permision when group changed" into oc-mr1-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
y [Fri, 13 Apr 2018 21:08:07 +0000 (14:08 -0700)]
[automerger] ResStringPool: Fix security vulnerability am:
7e54c3f261 am:
98e2d2ec50 am:
24a89da344 am:
d85632ae40 am:
927b3357fa am:
79d0fb2530 am:
a509e771ba am:
80e36faa72 am:
76d71fa910 am:
86cfcaa610
am:
4f5e234020
Change-Id: Iedf59329ed35149cec2143e8f179c7912534a41d
y [Fri, 13 Apr 2018 20:57:36 +0000 (13:57 -0700)]
[automerger] ResStringPool: Fix security vulnerability am:
7e54c3f261 am:
98e2d2ec50 am:
24a89da344 am:
d85632ae40 am:
927b3357fa am:
79d0fb2530 am:
a509e771ba am:
80e36faa72 am:
76d71fa910
am:
86cfcaa610
Change-Id: I6d37d24fd14271d24595c380ea553cb37948fa9e
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
OSDN Git Service
