Jeff Sharkey
07c4c8efed
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours am: 45fc104958 -s ours am: 19fa568b39 am: 2bf724509c am: a954c8c716
...
am: 91b1cb4b23 -s ours
Change-Id: I5d27e57aed8586fd203bc6dacca480e97ab9ca25
2017-10-18 19:27:49 +00:00
Jeff Sharkey
416ecb20a3
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
2017-10-18 19:27:11 +00:00
Jeff Sharkey
91b1cb4b23
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours am: 45fc104958 -s ours am: 19fa568b39 am: 2bf724509c
...
am: a954c8c716
Change-Id: I7ae7ab6c40fdcce484c39bdd3314dd4c831b3545
2017-10-18 19:21:53 +00:00
Jeff Sharkey
fad1e6a315
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours am: 5b2a431787 am: 9ba609cef9
...
am: c1ebc09ff0
Change-Id: I8f4e5fbc1952b6c7014fbc8c7abac5fcf54af520
2017-10-18 19:20:50 +00:00
Jeff Sharkey
a954c8c716
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours am: 45fc104958 -s ours am: 19fa568b39
...
am: 2bf724509c
Change-Id: Ia037ac67d83799f104cd30b6caaaad8485ae0326
2017-10-18 18:57:57 +00:00
Jeff Sharkey
c1ebc09ff0
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours am: 5b2a431787
...
am: 9ba609cef9
Change-Id: I9148b6352ab44e21e3a81a4d1bc783c867d614e8
2017-10-18 18:57:03 +00:00
Jeff Sharkey
2bf724509c
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours am: 45fc104958 -s ours
...
am: 19fa568b39
Change-Id: Id8d333be6d14dac643447f1310629a1adc0fc2cc
2017-10-18 18:40:10 +00:00
Jeff Sharkey
9ba609cef9
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours
...
am: 5b2a431787
Change-Id: Ie5d9d4c5e7f0d9829ad807e7a43edd2d81001aaf
2017-10-18 18:39:25 +00:00
Jeff Sharkey
19fa568b39
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours
...
am: 45fc104958 -s ours
Change-Id: Ibdd0283a40c9d8994b902f31ed2a80ff894384eb
2017-10-18 18:29:15 +00:00
Jeff Sharkey
5b2a431787
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
...
am: 4cfc684346 -s ours
Change-Id: I16f3a2141ed4773b043e9d5553c7eb44e296b428
2017-10-18 18:28:28 +00:00
Jeff Sharkey
45fc104958
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
...
am: 5ef2cfac97 -s ours
Change-Id: I5b16d712ea2e7b7c98ccef5fc74fa47527e588e0
2017-10-11 23:03:25 +00:00
Jeff Sharkey
004f90f35e
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7
...
am: ba66bb8a43 -s ours
Change-Id: I3431178e94b81aa61b7f829217a40fdee4eac141
2017-10-11 20:35:23 +00:00
Jeff Sharkey
89791cb5c3
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb
...
am: 45926efd0f -s ours
Change-Id: Ieeea7848f879564074e1fb32d4c5c834d21e63cc
2017-10-11 20:34:40 +00:00
Jeff Sharkey
ba66bb8a43
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab
...
am: 95bbef26d7
Change-Id: I32314303ab0926d93ae035166e323bcce847b7bd
2017-10-11 20:32:38 +00:00
Jeff Sharkey
45926efd0f
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499
...
am: 556688abdb
Change-Id: Ia7daf15c3d9fc81ae8fdef25f79cc13558639e98
2017-10-11 20:31:41 +00:00
Jeff Sharkey
95bbef26d7
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188
...
am: e38a7f42ab
Change-Id: I9fffe94faecb7d36ac68ebfc388af01e4871031e
2017-10-11 20:28:13 +00:00
Jeff Sharkey
556688abdb
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
...
am: 019f31b499
Change-Id: I755c046ad6392a7582d5afc32bd1e4693bcae33e
2017-10-11 20:26:40 +00:00
Jeff Sharkey
e38a7f42ab
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
...
am: 94e678c188
Change-Id: Iffc23a1e80389d1afe9b10a7e992d9d19a33fe11
2017-10-11 20:24:31 +00:00
Jeff Sharkey
5ef2cfac97
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 3f218e8431 )
2017-10-03 20:32:03 +00:00
Jeff Sharkey
4cfc684346
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 3f218e8431 )
2017-10-03 20:31:54 +00:00
Jeff Sharkey
94e678c188
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 3f218e8431 )
2017-10-03 20:31:44 +00:00
Jeff Sharkey
019f31b499
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 3f218e8431 )
2017-10-03 20:31:34 +00:00
Jeff Sharkey
f32a4fad5d
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 3f218e8431 )
2017-10-03 20:31:23 +00:00
Suprabh Shukla
202970aa92
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
2017-08-16 20:06:04 +00:00
Suprabh Shukla
3ce6d3ee87
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
2017-08-16 20:02:33 +00:00
Suprabh Shukla
cf0caf8f22
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
2017-08-16 19:59:04 +00:00
Suprabh Shukla
a92a7e400f
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
2017-08-16 19:55:02 +00:00
Suprabh Shukla
de8e1f4be5
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
2017-08-16 19:55:01 +00:00
Suprabh Shukla
d22de194f5
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
2017-08-16 19:51:02 +00:00
Suprabh Shukla
694ab09ff3
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
2017-08-16 19:48:32 +00:00
Suprabh Shukla
7bd8e120cb
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
2017-08-16 19:47:06 +00:00
Suprabh Shukla
2e6cf5dcde
Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621
...
am: 72beaddfd4 -s ours
Change-Id: I10ef6e273e8fb369d86d01d441c1ae419fe3a5b1
2017-08-16 19:46:49 +00:00
Suprabh Shukla
29c1777ca5
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
2017-08-16 19:44:31 +00:00
Suprabh Shukla
0dba51f9f0
Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f2 -s ours
...
am: 78a9d598f1 -s ours
Change-Id: Id94c32bb309dfe9808b30a19fbd42334f3f9f19b
2017-08-16 19:43:31 +00:00
Suprabh Shukla
9acf640efd
Disabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155ea -s ours
...
am: 889036189b -s ours
Change-Id: I594f94b86435f6e5f1d4f487b276ac42fef4f994
2017-08-16 19:40:32 +00:00
Suprabh Shukla
72beaddfd4
Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece
...
am: ccad4a3621
Change-Id: I3cfe350f7c6f3ded761681b8f4062e32e833d94f
2017-08-16 19:39:49 +00:00
Suprabh Shukla
78a9d598f1
Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7
...
am: 93a9e9f7f2 -s ours
Change-Id: If5bfd68d2a899813edb2ab550d8a2c0ed2db8d63
2017-08-16 19:38:35 +00:00
Suprabh Shukla
889036189b
Disabling the activate button when paused am: de5df8b090 am: 779237e37f
...
am: 24547155ea -s ours
Change-Id: Ic61623b7affc9599126b915d5a0e2a1471a58ea2
2017-08-16 19:37:01 +00:00
Suprabh Shukla
ccad4a3621
Disabling the activate button when paused am: af5d8b9b03
...
am: 26f4aceece
Change-Id: If2a4dfdbe01e5bf1f2cfc6b2a61afc95f6f2addd
2017-08-16 19:33:34 +00:00
Suprabh Shukla
93a9e9f7f2
Disabling the activate button when paused am: 9ffee0d534
...
am: d27e28eab7
Change-Id: I975f6132333510ac6b40bf9683296885bdc54f05
2017-08-16 19:33:30 +00:00
Suprabh Shukla
24547155ea
Disabling the activate button when paused am: de5df8b090
...
am: 779237e37f
Change-Id: I43d2f39fc179380a169fb1d04be8e473eedcadfb
2017-08-16 19:32:31 +00:00
Suprabh Shukla
d27e28eab7
Disabling the activate button when paused
...
am: 9ffee0d534
Change-Id: I76f0f749ad159b50520e6f95d9bfaf2d8cca3429
2017-08-16 19:27:40 +00:00
Suprabh Shukla
26f4aceece
Disabling the activate button when paused
...
am: af5d8b9b03
Change-Id: Icf4cd1c4ff5a520a72f9deedf85c486e892da250
2017-08-16 19:26:00 +00:00
Suprabh Shukla
779237e37f
Disabling the activate button when paused
...
am: de5df8b090
Change-Id: I7878f3f3addbb0f47f3c145a34977a9ebb62a055
2017-08-16 19:25:59 +00:00
Suprabh Shukla
9ffee0d534
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
2017-08-15 03:43:10 +00:00
Suprabh Shukla
de5df8b090
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
2017-08-15 03:40:37 +00:00
Suprabh Shukla
8e08a9bb71
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
2017-08-15 03:35:43 +00:00
Suprabh Shukla
af5d8b9b03
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
2017-08-15 02:37:37 +00:00
Phil Weaver
2b8694c33d
Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230df
...
am: 4f8be72b18 -s ours
Change-Id: I2b510d0b70eb303fb93a68a0eee0d32bf1226d76
2017-07-18 23:58:43 +00:00
Phil Weaver
4f8be72b18
Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec
...
am: f9d05230df
Change-Id: I63ffb648e39d06390a7f72951ad41bed0cf5aac9
2017-07-18 23:41:33 +00:00