OSDN Git Service
Jeff Sharkey [Wed, 18 Oct 2017 20:06:00 +0000 (20:06 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours am:
416ecb20a3
am:
e341fe95bd
Change-Id: Ifc18f5afec1707d19224428ac88399d7463adf9c
Jeff Sharkey [Wed, 18 Oct 2017 19:39:10 +0000 (19:39 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours
am:
416ecb20a3
Change-Id: I152a5dc22a05e3952f3b0bd162f2826580a26db2
Jeff Sharkey [Wed, 18 Oct 2017 19:27:11 +0000 (19:27 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0
am:
fad1e6a315 -s ours
Change-Id: I46e94b20903455f26c62922aa735276434dc1fd0
Jeff Sharkey [Wed, 18 Oct 2017 19:20:50 +0000 (19:20 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9
am:
c1ebc09ff0
Change-Id: I8f4e5fbc1952b6c7014fbc8c7abac5fcf54af520
Jeff Sharkey [Wed, 18 Oct 2017 18:57:03 +0000 (18:57 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787
am:
9ba609cef9
Change-Id: I9148b6352ab44e21e3a81a4d1bc783c867d614e8
Jeff Sharkey [Wed, 18 Oct 2017 18:39:25 +0000 (18:39 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours
am:
5b2a431787
Change-Id: Ie5d9d4c5e7f0d9829ad807e7a43edd2d81001aaf
Jeff Sharkey [Wed, 18 Oct 2017 18:28:28 +0000 (18:28 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
am:
4cfc684346 -s ours
Change-Id: I16f3a2141ed4773b043e9d5553c7eb44e296b428
Jeff Sharkey [Wed, 11 Oct 2017 21:01:29 +0000 (21:01 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
94e678c188 am:
e38a7f42ab am:
95bbef26d7 am:
ba66bb8a43 -s ours am:
004f90f35e
am:
86cc9a681d
Change-Id: I30d07aff1d361734e7a962dd89d1935137ed64dd
Jeff Sharkey [Wed, 11 Oct 2017 21:00:27 +0000 (21:00 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
019f31b499 am:
556688abdb am:
45926efd0f -s ours am:
89791cb5c3
am:
b3d4bc8239
Change-Id: I02141baa2a53d2982856052a923be6ddd076c55f
Jeff Sharkey [Wed, 11 Oct 2017 20:46:28 +0000 (20:46 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
94e678c188 am:
e38a7f42ab am:
95bbef26d7 am:
ba66bb8a43 -s ours
am:
004f90f35e
Change-Id: I2665557fb25ced0978a90fed4edff989011e01ed
Jeff Sharkey [Wed, 11 Oct 2017 20:45:04 +0000 (20:45 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
019f31b499 am:
556688abdb am:
45926efd0f -s ours
am:
89791cb5c3
Change-Id: Ie179a077b08e79040603c467e0a912731636e2f2
Jeff Sharkey [Wed, 11 Oct 2017 20:35:23 +0000 (20:35 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
94e678c188 am:
e38a7f42ab am:
95bbef26d7
am:
ba66bb8a43 -s ours
Change-Id: I3431178e94b81aa61b7f829217a40fdee4eac141
Jeff Sharkey [Wed, 11 Oct 2017 20:34:40 +0000 (20:34 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
019f31b499 am:
556688abdb
am:
45926efd0f -s ours
Change-Id: Ieeea7848f879564074e1fb32d4c5c834d21e63cc
Jeff Sharkey [Wed, 11 Oct 2017 20:32:38 +0000 (20:32 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
94e678c188 am:
e38a7f42ab
am:
95bbef26d7
Change-Id: I32314303ab0926d93ae035166e323bcce847b7bd
Jeff Sharkey [Wed, 11 Oct 2017 20:31:41 +0000 (20:31 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
019f31b499
am:
556688abdb
Change-Id: Ia7daf15c3d9fc81ae8fdef25f79cc13558639e98
Jeff Sharkey [Wed, 11 Oct 2017 20:29:25 +0000 (20:29 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
f32a4fad5d
am:
7c41707eaf
Change-Id: Ifc8c25371b0d2062e4c51ee6fcbf75e275331b30
Jeff Sharkey [Wed, 11 Oct 2017 20:28:13 +0000 (20:28 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
94e678c188
am:
e38a7f42ab
Change-Id: I9fffe94faecb7d36ac68ebfc388af01e4871031e
Jeff Sharkey [Wed, 11 Oct 2017 20:26:40 +0000 (20:26 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
am:
019f31b499
Change-Id: I755c046ad6392a7582d5afc32bd1e4693bcae33e
Jeff Sharkey [Wed, 11 Oct 2017 20:25:11 +0000 (20:25 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
am:
f32a4fad5d
Change-Id: I54e65289ff205196bd4fba9f0d40dc1f9f116e2b
Jeff Sharkey [Wed, 11 Oct 2017 20:24:31 +0000 (20:24 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
am:
94e678c188
Change-Id: Iffc23a1e80389d1afe9b10a7e992d9d19a33fe11
Jeff Sharkey [Mon, 12 Jun 2017 23:33:58 +0000 (17:33 -0600)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
This picker has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.
Test: builds, boots
Bug:
32879772
Change-Id: I91c48c73287a271bd6c99e60e216dead22e68764
(cherry picked from commit
3f218e8431cb5648bcb46131551c133ba53ef870)
Jeff Sharkey [Mon, 12 Jun 2017 23:33:58 +0000 (17:33 -0600)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
This picker has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.
Test: builds, boots
Bug:
32879772
Change-Id: I91c48c73287a271bd6c99e60e216dead22e68764
(cherry picked from commit
3f218e8431cb5648bcb46131551c133ba53ef870)
Jeff Sharkey [Mon, 12 Jun 2017 23:33:58 +0000 (17:33 -0600)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
This picker has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.
Test: builds, boots
Bug:
32879772
Change-Id: I91c48c73287a271bd6c99e60e216dead22e68764
(cherry picked from commit
3f218e8431cb5648bcb46131551c133ba53ef870)
Jeff Sharkey [Mon, 12 Jun 2017 23:33:58 +0000 (17:33 -0600)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
This picker has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.
Test: builds, boots
Bug:
32879772
Change-Id: I91c48c73287a271bd6c99e60e216dead22e68764
(cherry picked from commit
3f218e8431cb5648bcb46131551c133ba53ef870)
Jeff Sharkey [Mon, 12 Jun 2017 23:33:58 +0000 (17:33 -0600)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
This picker has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.
Test: builds, boots
Bug:
32879772
Change-Id: I91c48c73287a271bd6c99e60e216dead22e68764
(cherry picked from commit
3f218e8431cb5648bcb46131551c133ba53ef870)
Suprabh Shukla [Wed, 16 Aug 2017 20:14:42 +0000 (20:14 +0000)]
Disabling the activate button when paused am:
de5df8b090 am:
779237e37f am:
24547155ea -s ours am:
889036189b -s ours am:
9acf640efd -s ours am:
29c1777ca5 -s ours am:
694ab09ff3 -s ours am:
a92a7e400f -s ours am:
cf0caf8f22 -s ours am:
3ce6d3ee87 -s ours am:
202970aa92 -s ours
am:
81ba0cc873 -s ours
Change-Id: I53467a6c6802c65bf458afa8fd800954bc91f99b
Suprabh Shukla [Wed, 16 Aug 2017 20:10:37 +0000 (20:10 +0000)]
Disabling the activate button when paused am:
de5df8b090 am:
779237e37f am:
24547155ea -s ours am:
889036189b -s ours am:
9acf640efd -s ours am:
29c1777ca5 -s ours am:
694ab09ff3 -s ours am:
a92a7e400f -s ours am:
cf0caf8f22 -s ours am:
3ce6d3ee87 -s ours
am:
202970aa92 -s ours
Change-Id: Ic1b3450cc4d3cf70cf95b6f80e0b5fd82ff61446
Suprabh Shukla [Wed, 16 Aug 2017 20:06:04 +0000 (20:06 +0000)]
Disabling the activate button when paused am:
de5df8b090 am:
779237e37f am:
24547155ea -s ours am:
889036189b -s ours am:
9acf640efd -s ours am:
29c1777ca5 -s ours am:
694ab09ff3 -s ours am:
a92a7e400f -s ours am:
cf0caf8f22 -s ours
am:
3ce6d3ee87 -s ours
Change-Id: I8afbb6a39eb1cffe0cafc94a4b3c98629afce27c
Suprabh Shukla [Wed, 16 Aug 2017 20:04:24 +0000 (20:04 +0000)]
Disabling the activate button when paused am:
9ffee0d534 am:
d27e28eab7 am:
93a9e9f7f2 -s ours am:
78a9d598f1 -s ours am:
0dba51f9f0 -s ours am:
7bd8e120cb -s ours am:
d22de194f5 -s ours am:
de8e1f4be5 -s ours
am:
b2f5566de5 -s ours
Change-Id: I12e7f9916aafaadb653e85c0af3de506b3a652a7
Suprabh Shukla [Wed, 16 Aug 2017 20:03:34 +0000 (20:03 +0000)]
Disabling the activate button when paused am:
af5d8b9b03 am:
26f4aceece am:
ccad4a3621 am:
72beaddfd4 -s ours am:
2e6cf5dcde -s ours
am:
817c35056c -s ours
Change-Id: I6ab3c67db3726cd15ca3114b0edb41d0ae248a3f
Suprabh Shukla [Wed, 16 Aug 2017 20:02:33 +0000 (20:02 +0000)]
Disabling the activate button when paused am:
de5df8b090 am:
779237e37f am:
24547155ea -s ours am:
889036189b -s ours am:
9acf640efd -s ours am:
29c1777ca5 -s ours am:
694ab09ff3 -s ours am:
a92a7e400f -s ours
am:
cf0caf8f22 -s ours
Change-Id: If3daaffd53e0ee3743f6f4a1608c5114cfa498b7
Suprabh Shukla [Wed, 16 Aug 2017 19:59:04 +0000 (19:59 +0000)]
Disabling the activate button when paused am:
de5df8b090 am:
779237e37f am:
24547155ea -s ours am:
889036189b -s ours am:
9acf640efd -s ours am:
29c1777ca5 -s ours am:
694ab09ff3 -s ours
am:
a92a7e400f -s ours
Change-Id: I050ec3b9ce32d4a91add1447bab7845163348485
Suprabh Shukla [Wed, 16 Aug 2017 19:59:04 +0000 (19:59 +0000)]
Disabling the activate button when paused am:
9ffee0d534 am:
d27e28eab7 am:
93a9e9f7f2 -s ours am:
78a9d598f1 -s ours am:
0dba51f9f0 -s ours am:
7bd8e120cb -s ours am:
d22de194f5 -s ours
am:
de8e1f4be5 -s ours
Change-Id: I991cd251a7f54d16dff7df676aff5fed265a07d3
Suprabh Shukla [Wed, 16 Aug 2017 19:55:14 +0000 (19:55 +0000)]
Disabling the activate button when paused am:
af5d8b9b03 am:
26f4aceece am:
ccad4a3621 am:
72beaddfd4 -s ours
am:
2e6cf5dcde -s ours
Change-Id: I490c9f78edd2a1d87ba3b669ea24ac962b91cb61
Suprabh Shukla [Wed, 16 Aug 2017 19:55:02 +0000 (19:55 +0000)]
Disabling the activate button when paused am:
de5df8b090 am:
779237e37f am:
24547155ea -s ours am:
889036189b -s ours am:
9acf640efd -s ours am:
29c1777ca5 -s ours
am:
694ab09ff3 -s ours
Change-Id: Ib0587f73a715928275159027c09286127d063684
Suprabh Shukla [Wed, 16 Aug 2017 19:55:01 +0000 (19:55 +0000)]
Disabling the activate button when paused am:
9ffee0d534 am:
d27e28eab7 am:
93a9e9f7f2 -s ours am:
78a9d598f1 -s ours am:
0dba51f9f0 -s ours am:
7bd8e120cb -s ours
am:
d22de194f5 -s ours
Change-Id: I953f903e7298541160ed8c17f274a832618c152e
Suprabh Shukla [Wed, 16 Aug 2017 19:51:02 +0000 (19:51 +0000)]
Disabling the activate button when paused am:
9ffee0d534 am:
d27e28eab7 am:
93a9e9f7f2 -s ours am:
78a9d598f1 -s ours am:
0dba51f9f0 -s ours
am:
7bd8e120cb -s ours
Change-Id: I2f06097aaaa7e312a0b066e2f92536968d31003f
Suprabh Shukla [Wed, 16 Aug 2017 19:48:32 +0000 (19:48 +0000)]
Disabling the activate button when paused am:
de5df8b090 am:
779237e37f am:
24547155ea -s ours am:
889036189b -s ours am:
9acf640efd -s ours
am:
29c1777ca5 -s ours
Change-Id: I31830a5e46544e1f939a05482f46a03970e4b197
Suprabh Shukla [Wed, 16 Aug 2017 19:47:06 +0000 (19:47 +0000)]
Disabling the activate button when paused am:
9ffee0d534 am:
d27e28eab7 am:
93a9e9f7f2 -s ours am:
78a9d598f1 -s ours
am:
0dba51f9f0 -s ours
Change-Id: Ife5e67db0c3866b3bae77d1d0f476bc7f30bf389
Suprabh Shukla [Wed, 16 Aug 2017 19:46:49 +0000 (19:46 +0000)]
Disabling the activate button when paused am:
af5d8b9b03 am:
26f4aceece am:
ccad4a3621
am:
72beaddfd4 -s ours
Change-Id: I10ef6e273e8fb369d86d01d441c1ae419fe3a5b1
Suprabh Shukla [Wed, 16 Aug 2017 19:44:31 +0000 (19:44 +0000)]
Disabling the activate button when paused am:
de5df8b090 am:
779237e37f am:
24547155ea -s ours am:
889036189b -s ours
am:
9acf640efd -s ours
Change-Id: I3ad55685aaddb775a1991d5251fc01aa69c3a7f0
Suprabh Shukla [Wed, 16 Aug 2017 19:43:31 +0000 (19:43 +0000)]
Disabling the activate button when paused am:
9ffee0d534 am:
d27e28eab7 am:
93a9e9f7f2 -s ours
am:
78a9d598f1 -s ours
Change-Id: Id94c32bb309dfe9808b30a19fbd42334f3f9f19b
Suprabh Shukla [Wed, 16 Aug 2017 19:40:32 +0000 (19:40 +0000)]
Disabling the activate button when paused am:
de5df8b090 am:
779237e37f am:
24547155ea -s ours
am:
889036189b -s ours
Change-Id: I594f94b86435f6e5f1d4f487b276ac42fef4f994
Suprabh Shukla [Wed, 16 Aug 2017 19:39:49 +0000 (19:39 +0000)]
Disabling the activate button when paused am:
af5d8b9b03 am:
26f4aceece
am:
ccad4a3621
Change-Id: I3cfe350f7c6f3ded761681b8f4062e32e833d94f
Suprabh Shukla [Wed, 16 Aug 2017 19:38:35 +0000 (19:38 +0000)]
Disabling the activate button when paused am:
9ffee0d534 am:
d27e28eab7
am:
93a9e9f7f2 -s ours
Change-Id: If5bfd68d2a899813edb2ab550d8a2c0ed2db8d63
Suprabh Shukla [Wed, 16 Aug 2017 19:37:01 +0000 (19:37 +0000)]
Disabling the activate button when paused am:
de5df8b090 am:
779237e37f
am:
24547155ea -s ours
Change-Id: Ic61623b7affc9599126b915d5a0e2a1471a58ea2
Suprabh Shukla [Wed, 16 Aug 2017 19:33:34 +0000 (19:33 +0000)]
Disabling the activate button when paused am:
af5d8b9b03
am:
26f4aceece
Change-Id: If2a4dfdbe01e5bf1f2cfc6b2a61afc95f6f2addd
Suprabh Shukla [Wed, 16 Aug 2017 19:33:30 +0000 (19:33 +0000)]
Disabling the activate button when paused am:
9ffee0d534
am:
d27e28eab7
Change-Id: I975f6132333510ac6b40bf9683296885bdc54f05
Suprabh Shukla [Wed, 16 Aug 2017 19:32:31 +0000 (19:32 +0000)]
Disabling the activate button when paused am:
de5df8b090
am:
779237e37f
Change-Id: I43d2f39fc179380a169fb1d04be8e473eedcadfb
Suprabh Shukla [Wed, 16 Aug 2017 19:27:40 +0000 (19:27 +0000)]
Disabling the activate button when paused
am:
9ffee0d534
Change-Id: I76f0f749ad159b50520e6f95d9bfaf2d8cca3429
Suprabh Shukla [Wed, 16 Aug 2017 19:26:00 +0000 (19:26 +0000)]
Disabling the activate button when paused
am:
af5d8b9b03
Change-Id: Icf4cd1c4ff5a520a72f9deedf85c486e892da250
Suprabh Shukla [Wed, 16 Aug 2017 19:25:59 +0000 (19:25 +0000)]
Disabling the activate button when paused am:
8e08a9bb71
am:
08207f457d
Change-Id: I693fde0d9935e0b92fa8848b205db3a810a58b67
Suprabh Shukla [Wed, 16 Aug 2017 19:25:59 +0000 (19:25 +0000)]
Disabling the activate button when paused
am:
de5df8b090
Change-Id: I7878f3f3addbb0f47f3c145a34977a9ebb62a055
Suprabh Shukla [Wed, 16 Aug 2017 19:22:01 +0000 (19:22 +0000)]
Disabling the activate button when paused
am:
8e08a9bb71
Change-Id: I9b9ccd0bd849d34343ff0a6d6b579274d02264c6
Suprabh Shukla [Tue, 15 Aug 2017 02:22:17 +0000 (02:22 +0000)]
Disabling the activate button when paused
This revises the previous attempt to drop taps when another window is
obscuring the device admin details. Any system alert windows or toasts
are disabled when the activity is in focus, otherwise the button is
disabled so no floating activities can obscure it and delegate taps back
to the security sensitive "Activate" button.
Bug:
35056974
Change-Id: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Merged-In: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Suprabh Shukla [Tue, 15 Aug 2017 02:11:26 +0000 (02:11 +0000)]
Disabling the activate button when paused
This revises the previous attempt to drop taps when another window is
obscuring the device admin details. Any system alert windows or toasts
are disabled when the activity is in focus, otherwise the button is
disabled so no floating activities can obscure it and delegate taps back
to the security sensitive "Activate" button.
Bug:
35056974
Change-Id: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Merged-In: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Suprabh Shukla [Tue, 15 Aug 2017 03:33:12 +0000 (03:33 +0000)]
Disabling the activate button when paused
This revises the previous attempt to drop taps when another window is
obscuring the device admin details. Any system alert windows or toasts
are disabled when the activity is in focus, otherwise the button is
disabled so no floating activities can obscure it and delegate taps back
to the security sensitive "Activate" button.
Test: CtsVerifier -> Device Administration -> Device Admin Tapjacking Test
Bug:
35056974
Change-Id: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Merged-In: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Suprabh Shukla [Tue, 15 Aug 2017 02:34:05 +0000 (02:34 +0000)]
Disabling the activate button when paused
This revises the previous attempt to drop taps when another window is
obscuring the device admin details. Any system alert windows or toasts
are disabled when the activity is in focus, otherwise the button is
disabled so no floating activities can obscure it and delegate taps back
to the security sensitive "Activate" button.
Test: CtsVerifier -> Device Administration -> Device Admin Tapjacking Test
Bug:
35056974
Change-Id: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Merged-In: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Phil Weaver [Wed, 19 Jul 2017 00:46:35 +0000 (00:46 +0000)]
Merge "Back-port ag/
2491664" into nyc-mr1-dev
Phil Weaver [Wed, 19 Jul 2017 00:15:50 +0000 (00:15 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev am:
7b3ca9886e am:
a801d5e8ec am:
f9d05230df am:
4f8be72b18 -s ours am:
2b8694c33d
am:
533c1efbc7
Change-Id: Ib54143b47f6c1b09d2d3c5f73630aebcc1fcba33
Phil Weaver [Wed, 19 Jul 2017 00:05:08 +0000 (00:05 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev am:
7b3ca9886e am:
a801d5e8ec am:
f9d05230df am:
4f8be72b18 -s ours
am:
2b8694c33d
Change-Id: Icef5847bf3eaf4c9fdce6eaaff1d642828f89477
Phil Weaver [Tue, 18 Jul 2017 23:58:43 +0000 (23:58 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev am:
7b3ca9886e am:
a801d5e8ec am:
f9d05230df
am:
4f8be72b18 -s ours
Change-Id: I2b510d0b70eb303fb93a68a0eee0d32bf1226d76
Phil Weaver [Tue, 18 Jul 2017 23:41:33 +0000 (23:41 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev am:
7b3ca9886e am:
a801d5e8ec
am:
f9d05230df
Change-Id: I63ffb648e39d06390a7f72951ad41bed0cf5aac9
Phil Weaver [Tue, 18 Jul 2017 23:35:31 +0000 (23:35 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev am:
7b3ca9886e
am:
a801d5e8ec
Change-Id: I26fad2824208aa46dbfac0bef585729e5424c24c
Phil Weaver [Tue, 18 Jul 2017 23:29:03 +0000 (23:29 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev
am:
7b3ca9886e
Change-Id: Id4c50a2c37096f91accd2b2b28470c230dd655db
Phil Weaver [Tue, 18 Jul 2017 23:21:17 +0000 (23:21 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev
Phil Weaver [Wed, 12 Jul 2017 21:07:07 +0000 (14:07 -0700)]
Back-port ag/
2491664
Bug:
62196835
Test: Verify overlays disappear on a11y capabilities
dialog.
Change-Id: Ic675012dd9faa8e53d1d4b126b3ba68fecdab992
Phil Weaver [Tue, 18 Jul 2017 21:55:39 +0000 (21:55 +0000)]
Merge "Back-port ag/
2491664" into nyc-dev am:
3adf585961 -s ours
am:
6fee9a5e91
Change-Id: I463a22c05f439acd264c21cb99d2700e9600b78d
Phil Weaver [Tue, 18 Jul 2017 21:44:43 +0000 (21:44 +0000)]
Merge "Back-port ag/
2491664" into nyc-dev
am:
3adf585961 -s ours
Change-Id: I8ba7e805110028752e1968e38ac548fcd4194438
Phil Weaver [Tue, 18 Jul 2017 21:23:17 +0000 (21:23 +0000)]
Merge "Back-port ag/
2491664" into nyc-dev
Phil Weaver [Tue, 18 Jul 2017 21:13:41 +0000 (21:13 +0000)]
Merge "Back-port ag/
2491664" into lmp-dev am:
41492a1e2c am:
cbbdc18c7b am:
c84dc8feb3 am:
4b029f8b0d am:
4c70016a94 am:
46592e90a9 am:
55b3b1f349 am:
af26bae8b3
am:
a1426f209c
Change-Id: I410bcb403ace5044da8f98fadbb622a44d21021b
Phil Weaver [Tue, 18 Jul 2017 21:09:55 +0000 (21:09 +0000)]
Merge "Back-port ag/
2491664" into lmp-dev am:
41492a1e2c am:
cbbdc18c7b am:
c84dc8feb3 am:
4b029f8b0d am:
4c70016a94 am:
46592e90a9 am:
55b3b1f349
am:
af26bae8b3
Change-Id: I0dc45ca53a9c60c830795d6686a0d86efa356f4e
Phil Weaver [Tue, 18 Jul 2017 20:59:48 +0000 (20:59 +0000)]
Merge "Back-port ag/
2491664" into lmp-dev am:
41492a1e2c am:
cbbdc18c7b am:
c84dc8feb3 am:
4b029f8b0d am:
4c70016a94 am:
46592e90a9
am:
55b3b1f349
Change-Id: I89635be6d5f768bd4780dd1b6daeb30e9cbab4d2
Phil Weaver [Tue, 18 Jul 2017 20:54:26 +0000 (20:54 +0000)]
Back-port ag/
2491664 am:
1d21738bd6 am:
4150739791 -s ours am:
9d889600a9 am:
f6b1267780 am:
5d3967338d am:
57aa22c671 am:
91f4a42dac
am:
ba26fabe3e
Change-Id: I78f285821bc170c9a32b6e911e38826123c81820
Phil Weaver [Tue, 18 Jul 2017 20:54:21 +0000 (20:54 +0000)]
Merge "Back-port ag/
2491664" into lmp-dev am:
41492a1e2c am:
cbbdc18c7b am:
c84dc8feb3 am:
4b029f8b0d am:
4c70016a94
am:
46592e90a9
Change-Id: If666cdb52e2565e889fd026917eaea20502ca59e
Phil Weaver [Tue, 18 Jul 2017 20:52:25 +0000 (20:52 +0000)]
Back-port ag/
2491664 am:
1d21738bd6 am:
4150739791 -s ours am:
9d889600a9 am:
f6b1267780 am:
5d3967338d am:
57aa22c671
am:
91f4a42dac
Change-Id: Iaf412cbcc4b9a3513ba27672ae2e1cfc04e57da5
Phil Weaver [Tue, 18 Jul 2017 20:49:55 +0000 (20:49 +0000)]
Back-port ag/
2491664 am:
1d21738bd6 am:
4150739791 -s ours am:
9d889600a9 am:
f6b1267780 am:
5d3967338d
am:
57aa22c671
Change-Id: Ia487b2e3c0ee6c4eace1502704fda873e3690300
Phil Weaver [Tue, 18 Jul 2017 20:47:53 +0000 (20:47 +0000)]
Back-port ag/
2491664 am:
1d21738bd6 am:
4150739791 -s ours am:
9d889600a9 am:
f6b1267780
am:
5d3967338d
Change-Id: Idcd6c6ab5a7cf0a594236a41a949031ed3e9855c
Phil Weaver [Tue, 18 Jul 2017 20:47:09 +0000 (20:47 +0000)]
Merge "Back-port ag/
2491664" into lmp-dev am:
41492a1e2c am:
cbbdc18c7b am:
c84dc8feb3 am:
4b029f8b0d
am:
4c70016a94
Change-Id: I0b78bc04741d8b0d2d7af292484a025d0c62fd6a
Phil Weaver [Tue, 18 Jul 2017 20:46:34 +0000 (20:46 +0000)]
Back-port ag/
2491664 am:
1d21738bd6 am:
4150739791 -s ours am:
9d889600a9
am:
f6b1267780
Change-Id: I2e61b6da4262cf05ca30e2c2d505eb9cae017a9a
Phil Weaver [Tue, 18 Jul 2017 20:38:01 +0000 (20:38 +0000)]
Merge "Back-port ag/
2491664" into lmp-dev am:
41492a1e2c am:
cbbdc18c7b am:
c84dc8feb3
am:
4b029f8b0d
Change-Id: Ibedf70b6b6b14d51ba482f28f2db9c04c10457d6
Phil Weaver [Tue, 18 Jul 2017 20:35:06 +0000 (20:35 +0000)]
Back-port ag/
2491664 am:
1d21738bd6 am:
4150739791 -s ours
am:
9d889600a9
Change-Id: Ia718620b0ec683d6b24cca6e56e9378a68d0ae3f
Phil Weaver [Tue, 18 Jul 2017 20:28:31 +0000 (20:28 +0000)]
Merge "Back-port ag/
2491664" into lmp-dev am:
41492a1e2c am:
cbbdc18c7b
am:
c84dc8feb3
Change-Id: Ia81f4d5e0e9d433e33e19a70a9f63a6cc2afb79a
Phil Weaver [Tue, 18 Jul 2017 20:25:56 +0000 (20:25 +0000)]
Back-port ag/
2491664 am:
1d21738bd6
am:
4150739791 -s ours
Change-Id: I580b7232fcbe2c2025d2fd35e7f04ddf1255fd6b
Phil Weaver [Tue, 18 Jul 2017 18:36:26 +0000 (18:36 +0000)]
Merge "Back-port ag/
2491664" into lmp-dev am:
41492a1e2c
am:
cbbdc18c7b
Change-Id: I3cb41508ce487f1d4a21517c86ef57f9cc041705
Phil Weaver [Tue, 18 Jul 2017 18:26:18 +0000 (18:26 +0000)]
Merge "Back-port ag/
2491664" into lmp-dev
am:
41492a1e2c
Change-Id: I4e099fb9a737936f12357670635232a7913e3cfd
Phil Weaver [Tue, 18 Jul 2017 18:26:16 +0000 (18:26 +0000)]
Back-port ag/
2491664
am:
1d21738bd6
Change-Id: I30088c2cb1b8c343d21e0b095700df472127c612
Phil Weaver [Tue, 18 Jul 2017 18:19:39 +0000 (18:19 +0000)]
Merge "Back-port ag/
2491664" into lmp-dev
Phil Weaver [Wed, 12 Jul 2017 21:07:07 +0000 (14:07 -0700)]
Back-port ag/
2491664
Bug:
62196835
Test: Verify overlays disappear on a11y capabilities
dialog.
Change-Id: Ic675012dd9faa8e53d1d4b126b3ba68fecdab992
Phil Weaver [Wed, 12 Jul 2017 21:07:07 +0000 (14:07 -0700)]
Back-port ag/
2491664
Bug:
62196835
Test: Verify overlays disappear on a11y capabilities
dialog.
Change-Id: Ic675012dd9faa8e53d1d4b126b3ba68fecdab992
Phil Weaver [Wed, 12 Jul 2017 21:07:07 +0000 (14:07 -0700)]
Back-port ag/
2491664
Bug:
62196835
Test: Verify overlays disappear on a11y capabilities
dialog.
Change-Id: Ic675012dd9faa8e53d1d4b126b3ba68fecdab992
Phil Weaver [Wed, 12 Jul 2017 22:56:17 +0000 (22:56 +0000)]
DO NOT MERGE Back-port ag/
2491664 am:
9a14484b38 am:
840b78e19e am:
bebc9f9f3c -s ours am:
98e0930394 -s ours am:
df045253a4 am:
b72ffa47a4 -s ours am:
bb12830bf9 am:
4a40ef7688 am:
a486c82d9c am:
24aaf4d7ad -s ours am:
e9d2bdc380
am:
8bf67896d6
Change-Id: If3df05ce2112fb26b53651f51d47987d4f8582ca
Phil Weaver [Wed, 12 Jul 2017 22:50:05 +0000 (22:50 +0000)]
DO NOT MERGE Back-port ag/
2491664 am:
9a14484b38 am:
840b78e19e am:
bebc9f9f3c -s ours am:
98e0930394 -s ours am:
df045253a4 am:
b72ffa47a4 -s ours am:
bb12830bf9 am:
4a40ef7688 am:
a486c82d9c am:
24aaf4d7ad -s ours
am:
e9d2bdc380
Change-Id: I568b19d74265138d2f5cb563491c379bcfbb18aa
Phil Weaver [Wed, 12 Jul 2017 22:41:40 +0000 (22:41 +0000)]
DO NOT MERGE Back-port ag/
2491664 am:
9a14484b38 am:
840b78e19e am:
bebc9f9f3c -s ours am:
98e0930394 -s ours am:
df045253a4 am:
b72ffa47a4 -s ours am:
bb12830bf9 am:
4a40ef7688 am:
a486c82d9c
am:
24aaf4d7ad -s ours
Change-Id: Ibf0c76ba5e9059cd87282cefa9b0c7724ed64128
Phil Weaver [Wed, 12 Jul 2017 22:35:43 +0000 (22:35 +0000)]
DO NOT MERGE Back-port ag/
2491664 am:
9a14484b38 am:
840b78e19e am:
bebc9f9f3c -s ours am:
98e0930394 -s ours am:
df045253a4 am:
b72ffa47a4 -s ours am:
bb12830bf9 am:
4a40ef7688
am:
a486c82d9c
Change-Id: Ib92175b78417bda6e58da2b93e37143a428852c0
Phil Weaver [Wed, 12 Jul 2017 22:29:09 +0000 (22:29 +0000)]
DO NOT MERGE Back-port ag/
2491664 am:
9a14484b38 am:
840b78e19e am:
bebc9f9f3c -s ours am:
98e0930394 -s ours am:
df045253a4 am:
b72ffa47a4 -s ours am:
bb12830bf9
am:
4a40ef7688
Change-Id: I6d627519091040c4d64841210003de8aa1471f53
Phil Weaver [Wed, 12 Jul 2017 22:23:16 +0000 (22:23 +0000)]
DO NOT MERGE Back-port ag/
2491664 am:
9a14484b38 am:
840b78e19e am:
bebc9f9f3c -s ours am:
98e0930394 -s ours am:
df045253a4 am:
b72ffa47a4 -s ours
am:
bb12830bf9
Change-Id: I51e797becf12a2c21e04eb5e701b44cad5f8045f
Phil Weaver [Wed, 12 Jul 2017 22:19:08 +0000 (22:19 +0000)]
DO NOT MERGE Back-port ag/
2491664 am:
9a14484b38 am:
840b78e19e am:
bebc9f9f3c -s ours am:
98e0930394 -s ours am:
df045253a4
am:
b72ffa47a4 -s ours
Change-Id: Idc84d1fbeb9e6bcb219c231af4565b666d2d1f00
Phil Weaver [Wed, 12 Jul 2017 22:13:16 +0000 (22:13 +0000)]
DO NOT MERGE Back-port ag/
2491664 am:
9a14484b38 am:
840b78e19e am:
bebc9f9f3c -s ours am:
98e0930394 -s ours
am:
df045253a4
Change-Id: I1ec6fc85e78e081fba4858c8cb4bd7aa2751811c
Phil Weaver [Wed, 12 Jul 2017 22:06:35 +0000 (22:06 +0000)]
DO NOT MERGE Back-port ag/
2491664 am:
9a14484b38 am:
840b78e19e am:
bebc9f9f3c -s ours
am:
98e0930394 -s ours
Change-Id: I8de29bde0bf73adde876e6cba0e4e61de6e4f2cb