Suprabh Shukla
817c35056c
Disabling the activate button when paused am: af5d8b9b03
am: 26f4aceece
am: ccad4a3621
am: 72beaddfd4
-s ours
...
am: 2e6cf5dcde
-s ours
Change-Id: I490c9f78edd2a1d87ba3b669ea24ac962b91cb61
2017-08-16 19:55:14 +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
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
ccad4a3621
Disabling the activate button when paused am: af5d8b9b03
...
am: 26f4aceece
Change-Id: If2a4dfdbe01e5bf1f2cfc6b2a61afc95f6f2addd
2017-08-16 19:33:34 +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
08207f457d
Disabling the activate button when paused
...
am: 8e08a9bb71
Change-Id: I9b9ccd0bd849d34343ff0a6d6b579274d02264c6
2017-08-16 19:22:01 +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
533c1efbc7
Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e
am: a801d5e8ec
am: f9d05230df
am: 4f8be72b18
-s ours
...
am: 2b8694c33d
Change-Id: Icef5847bf3eaf4c9fdce6eaaff1d642828f89477
2017-07-19 00:05:08 +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
Phil Weaver
f9d05230df
Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e
...
am: a801d5e8ec
Change-Id: I26fad2824208aa46dbfac0bef585729e5424c24c
2017-07-18 23:35:31 +00:00
Phil Weaver
a801d5e8ec
Merge "Back-port ag/2491664" into mnc-dev
...
am: 7b3ca9886e
Change-Id: Id4c50a2c37096f91accd2b2b28470c230dd655db
2017-07-18 23:29:03 +00:00
Phil Weaver
7b3ca9886e
Merge "Back-port ag/2491664" into mnc-dev
2017-07-18 23:21:17 +00:00
Phil Weaver
6fee9a5e91
Merge "Back-port ag/2491664" into nyc-dev
...
am: 3adf585961
-s ours
Change-Id: I8ba7e805110028752e1968e38ac548fcd4194438
2017-07-18 21:44:43 +00:00
Phil Weaver
3adf585961
Merge "Back-port ag/2491664" into nyc-dev
2017-07-18 21:23:17 +00:00
Phil Weaver
a1426f209c
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
2017-07-18 21:09:55 +00:00
Phil Weaver
af26bae8b3
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
2017-07-18 20:59:48 +00:00
Phil Weaver
55b3b1f349
Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c
am: cbbdc18c7b
am: c84dc8feb3
am: 4b029f8b0d
am: 4c70016a94
...
am: 46592e90a9
Change-Id: If666cdb52e2565e889fd026917eaea20502ca59e
2017-07-18 20:54:21 +00:00
Phil Weaver
ba26fabe3e
Back-port ag/2491664 am: 1d21738bd6
am: 4150739791
-s ours am: 9d889600a9
am: f6b1267780
am: 5d3967338d
am: 57aa22c671
...
am: 91f4a42dac
Change-Id: Iaf412cbcc4b9a3513ba27672ae2e1cfc04e57da5
2017-07-18 20:52:25 +00:00
Phil Weaver
91f4a42dac
Back-port ag/2491664 am: 1d21738bd6
am: 4150739791
-s ours am: 9d889600a9
am: f6b1267780
am: 5d3967338d
...
am: 57aa22c671
Change-Id: Ia487b2e3c0ee6c4eace1502704fda873e3690300
2017-07-18 20:49:55 +00:00
Phil Weaver
57aa22c671
Back-port ag/2491664 am: 1d21738bd6
am: 4150739791
-s ours am: 9d889600a9
am: f6b1267780
...
am: 5d3967338d
Change-Id: Idcd6c6ab5a7cf0a594236a41a949031ed3e9855c
2017-07-18 20:47:53 +00:00
Phil Weaver
46592e90a9
Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c
am: cbbdc18c7b
am: c84dc8feb3
am: 4b029f8b0d
...
am: 4c70016a94
Change-Id: I0b78bc04741d8b0d2d7af292484a025d0c62fd6a
2017-07-18 20:47:09 +00:00
Phil Weaver
5d3967338d
Back-port ag/2491664 am: 1d21738bd6
am: 4150739791
-s ours am: 9d889600a9
...
am: f6b1267780
Change-Id: I2e61b6da4262cf05ca30e2c2d505eb9cae017a9a
2017-07-18 20:46:34 +00:00
Phil Weaver
4c70016a94
Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c
am: cbbdc18c7b
am: c84dc8feb3
...
am: 4b029f8b0d
Change-Id: Ibedf70b6b6b14d51ba482f28f2db9c04c10457d6
2017-07-18 20:38:01 +00:00
Phil Weaver
f6b1267780
Back-port ag/2491664 am: 1d21738bd6
am: 4150739791
-s ours
...
am: 9d889600a9
Change-Id: Ia718620b0ec683d6b24cca6e56e9378a68d0ae3f
2017-07-18 20:35:06 +00:00
Phil Weaver
4b029f8b0d
Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c
am: cbbdc18c7b
...
am: c84dc8feb3
Change-Id: Ia81f4d5e0e9d433e33e19a70a9f63a6cc2afb79a
2017-07-18 20:28:31 +00:00
Phil Weaver
9d889600a9
Back-port ag/2491664 am: 1d21738bd6
...
am: 4150739791
-s ours
Change-Id: I580b7232fcbe2c2025d2fd35e7f04ddf1255fd6b
2017-07-18 20:25:56 +00:00
Phil Weaver
c84dc8feb3
Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c
...
am: cbbdc18c7b
Change-Id: I3cb41508ce487f1d4a21517c86ef57f9cc041705
2017-07-18 18:36:26 +00:00
Phil Weaver
cbbdc18c7b
Merge "Back-port ag/2491664" into lmp-dev
...
am: 41492a1e2c
Change-Id: I4e099fb9a737936f12357670635232a7913e3cfd
2017-07-18 18:26:18 +00:00
Phil Weaver
4150739791
Back-port ag/2491664
...
am: 1d21738bd6
Change-Id: I30088c2cb1b8c343d21e0b095700df472127c612
2017-07-18 18:26:16 +00:00
Phil Weaver
41492a1e2c
Merge "Back-port ag/2491664" into lmp-dev
2017-07-18 18:19:39 +00:00
Phil Weaver
b1685ab057
Back-port ag/2491664
...
Bug: 62196835
Test: Verify overlays disappear on a11y capabilities
dialog.
Change-Id: Ic675012dd9faa8e53d1d4b126b3ba68fecdab992
2017-07-18 09:23:14 -07:00
Phil Weaver
cc395469bc
Back-port ag/2491664
...
Bug: 62196835
Test: Verify overlays disappear on a11y capabilities
dialog.
Change-Id: Ic675012dd9faa8e53d1d4b126b3ba68fecdab992
2017-07-17 16:38:07 -07:00
Phil Weaver
1d21738bd6
Back-port ag/2491664
...
Bug: 62196835
Test: Verify overlays disappear on a11y capabilities
dialog.
Change-Id: Ic675012dd9faa8e53d1d4b126b3ba68fecdab992
2017-07-13 00:03:49 +00:00
Phil Weaver
8bf67896d6
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
2017-07-12 22:50:05 +00:00
Phil Weaver
e9d2bdc380
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
2017-07-12 22:41:40 +00:00
Phil Weaver
24aaf4d7ad
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
2017-07-12 22:35:43 +00:00
Phil Weaver
a486c82d9c
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
2017-07-12 22:29:09 +00:00
Phil Weaver
4a40ef7688
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
2017-07-12 22:23:16 +00:00
Phil Weaver
bb12830bf9
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
2017-07-12 22:19:08 +00:00
Phil Weaver
b72ffa47a4
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
am: 840b78e19e
am: bebc9f9f3c
-s ours am: 98e0930394
-s ours
...
am: df045253a4
Change-Id: I1ec6fc85e78e081fba4858c8cb4bd7aa2751811c
2017-07-12 22:13:16 +00:00
Phil Weaver
df045253a4
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
am: 840b78e19e
am: bebc9f9f3c
-s ours
...
am: 98e0930394
-s ours
Change-Id: I8de29bde0bf73adde876e6cba0e4e61de6e4f2cb
2017-07-12 22:06:35 +00:00
Phil Weaver
98e0930394
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
am: 840b78e19e
...
am: bebc9f9f3c
-s ours
Change-Id: I1d6d10dace8425eb21bacd9582404e876da2db7c
2017-07-12 21:59:38 +00:00
Phil Weaver
bebc9f9f3c
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
...
am: 840b78e19e
Change-Id: I5b2add698df347db16bfedb196793ea77b70f8a8
2017-07-12 21:55:38 +00:00
Phil Weaver
840b78e19e
DO NOT MERGE Back-port ag/2491664
...
am: 9a14484b38
Change-Id: Ie1a9075d996f38ac8bbe56e19880bbfd6b9f9a96
2017-07-12 21:43:49 +00:00
Phil Weaver
485d94a7ef
Back-port ag/2491664
...
Bug: 62196835
Test: Verify overlays disappear on a11y capabilities
dialog.
Change-Id: Ic675012dd9faa8e53d1d4b126b3ba68fecdab992
2017-07-12 14:07:07 -07:00
Phil Weaver
9a14484b38
DO NOT MERGE Back-port ag/2491664
...
Bug: 62196835
Test: Verify overlays disappear on a11y capabilities
dialog.
Change-Id: Icbd00799e4b12cde9d17d3d0abbd38d9643b26c4
2017-07-12 20:50:13 +00:00
Phil Weaver
9b8abd652a
Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f
am: 5d6d70a50e
am: beb7f31d67
am: 11b6279ed4
...
am: adf8f8bc60
Change-Id: Id26b90f8d4afbf6e50bc8e43afced432c70dba68
2017-05-12 22:08:53 +00:00
Phil Weaver
adf8f8bc60
Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f
am: 5d6d70a50e
am: beb7f31d67
...
am: 11b6279ed4
Change-Id: I370c3f0ffc78f86b465d9721a753503b03d56d54
2017-05-12 22:07:24 +00:00