OSDN Git Service

android-x86/packages-apps-Settings.git
6 years agoDisabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a362...
Suprabh Shukla [Wed, 16 Aug 2017 20:08:56 +0000 (20:08 +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
am: 6d7bb4c4d0  -s ours

Change-Id: I3e042c60b170bf709b0848bc2746f0cba6afbbcf

6 years agoDisabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a362...
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

6 years agoDisabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a362...
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

6 years agoDisabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621
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

6 years agoDisabling the activate button when paused am: af5d8b9b03 am: 26f4aceece
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

6 years agoDisabling the activate button when paused am: af5d8b9b03
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

6 years agoDisabling the activate button when paused am: 8e08a9bb71 am: 08207f457d
Suprabh Shukla [Wed, 16 Aug 2017 19:30:03 +0000 (19:30 +0000)]
Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d
am: 1e9af33c41

Change-Id: Iea61138c41fdb00ee30e0fba0d06b1d59b9c6afa

6 years agoDisabling the activate button when paused
Suprabh Shukla [Wed, 16 Aug 2017 19:26:00 +0000 (19:26 +0000)]
Disabling the activate button when paused
am: af5d8b9b03

Change-Id: Icf4cd1c4ff5a520a72f9deedf85c486e892da250

6 years agoDisabling the activate button when paused am: 8e08a9bb71
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

6 years agoDisabling the activate button when paused
Suprabh Shukla [Wed, 16 Aug 2017 19:22:01 +0000 (19:22 +0000)]
Disabling the activate button when paused
am: 8e08a9bb71

Change-Id: I9b9ccd0bd849d34343ff0a6d6b579274d02264c6

6 years agoDisabling the activate button when paused
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

6 years agoDisabling the activate button when paused
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

7 years agoMerge "Back-port ag/2491664" into nyc-mr1-dev
Phil Weaver [Wed, 19 Jul 2017 00:53:20 +0000 (00:53 +0000)]
Merge "Back-port ag/2491664" into nyc-mr1-dev
am: 87c77fba92

Change-Id: Ie540995d5b499a0e87bc13c11e28c4b8adab93f3

7 years agoMerge "Back-port ag/2491664" into nyc-mr1-dev
Phil Weaver [Wed, 19 Jul 2017 00:46:35 +0000 (00:46 +0000)]
Merge "Back-port ag/2491664" into nyc-mr1-dev

7 years agoMerge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230d...
Phil Weaver [Wed, 19 Jul 2017 00:24:40 +0000 (00:24 +0000)]
Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230df am: 4f8be72b18  -s ours am: 2b8694c33d am: 533c1efbc7
am: f5675a9ab0

Change-Id: Icbc5147a6050058c78ece104f1c169673b93a373

7 years agoMerge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230d...
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

7 years agoMerge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230d...
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

7 years agoMerge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230df
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

7 years agoMerge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec
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

7 years agoMerge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e
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

7 years agoMerge "Back-port ag/2491664" into mnc-dev
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

7 years agoMerge "Back-port ag/2491664" into mnc-dev
Phil Weaver [Tue, 18 Jul 2017 23:21:17 +0000 (23:21 +0000)]
Merge "Back-port ag/2491664" into mnc-dev

7 years agoBack-port ag/2491664
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

7 years agoMerge "Back-port ag/2491664" into nyc-dev am: 3adf585961 -s ours am: 6fee9a5e91
Phil Weaver [Tue, 18 Jul 2017 22:03:51 +0000 (22:03 +0000)]
Merge "Back-port ag/2491664" into nyc-dev am: 3adf585961  -s ours am: 6fee9a5e91
am: ade8640d4d

Change-Id: I77a9c4c0d8ce78a02615c5e37bf1843c46a1e5d8

7 years agoMerge "Back-port ag/2491664" into nyc-dev am: 3adf585961 -s ours
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

7 years agoMerge "Back-port ag/2491664" into nyc-dev
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

7 years agoMerge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb...
Phil Weaver [Tue, 18 Jul 2017 21:24:36 +0000 (21:24 +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
am: 2e690de9cf

Change-Id: Idb805deec53765994f5ed8a1bd7b1f56d6717b3b

7 years agoMerge "Back-port ag/2491664" into nyc-dev
Phil Weaver [Tue, 18 Jul 2017 21:23:17 +0000 (21:23 +0000)]
Merge "Back-port ag/2491664" into nyc-dev

7 years agoMerge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb...
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

7 years agoMerge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb...
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

7 years agoMerge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb...
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

7 years agoBack-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b126...
Phil Weaver [Tue, 18 Jul 2017 20:57:24 +0000 (20:57 +0000)]
Back-port ag/2491664 am: 1d21738bd6 am: 4150739791  -s ours am: 9d889600a9 am: f6b1267780 am: 5d3967338d am: 57aa22c671 am: 91f4a42dac am: ba26fabe3e
am: 85aa9ccc69

Change-Id: I8d411e2b84113763c49ec5c627f966da662a42b6

7 years agoBack-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b126...
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

7 years agoMerge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb...
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

7 years agoBack-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b126...
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

7 years agoBack-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b126...
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

7 years agoBack-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b1267780
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

7 years agoMerge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb...
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

7 years agoBack-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9
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

7 years agoMerge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3
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

7 years agoBack-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours
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

7 years agoMerge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b
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

7 years agoBack-port ag/2491664 am: 1d21738bd6
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

7 years agoMerge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c
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

7 years agoMerge "Back-port ag/2491664" into lmp-dev
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

7 years agoBack-port ag/2491664
Phil Weaver [Tue, 18 Jul 2017 18:26:16 +0000 (18:26 +0000)]
Back-port ag/2491664
am: 1d21738bd6

Change-Id: I30088c2cb1b8c343d21e0b095700df472127c612

7 years agoMerge "Back-port ag/2491664" into lmp-dev
Phil Weaver [Tue, 18 Jul 2017 18:19:39 +0000 (18:19 +0000)]
Merge "Back-port ag/2491664" into lmp-dev

7 years agoBack-port ag/2491664
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

7 years agoBack-port ag/2491664
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

7 years agoBack-port ag/2491664
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

7 years agoDO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c ...
Phil Weaver [Wed, 12 Jul 2017 23:02:11 +0000 (23:02 +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
am: 254bbe84a3

Change-Id: I87ffde2e35401e7d027ddae59bbbeddbe6ed91dc

7 years agoDO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c ...
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

7 years agoDO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c ...
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

7 years agoDO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c ...
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

7 years agoDO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c ...
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

7 years agoDO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c ...
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

7 years agoDO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c ...
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

7 years agoDO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c ...
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

7 years agoDO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c ...
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

7 years agoDO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c ...
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

7 years agoDO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e
Phil Weaver [Wed, 12 Jul 2017 21:59:38 +0000 (21:59 +0000)]
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e
am: bebc9f9f3c  -s ours

Change-Id: I1d6d10dace8425eb21bacd9582404e876da2db7c

7 years agoDO NOT MERGE Back-port ag/2491664 am: 9a14484b38
Phil Weaver [Wed, 12 Jul 2017 21:55:38 +0000 (21:55 +0000)]
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
am: 840b78e19e

Change-Id: I5b2add698df347db16bfedb196793ea77b70f8a8

7 years agoDO NOT MERGE Back-port ag/2491664
Phil Weaver [Wed, 12 Jul 2017 21:43:49 +0000 (21:43 +0000)]
DO NOT MERGE Back-port ag/2491664
am: 9a14484b38

Change-Id: Ie1a9075d996f38ac8bbe56e19880bbfd6b9f9a96

7 years agoBack-port ag/2491664
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

7 years agoDO NOT MERGE Back-port ag/2491664
Phil Weaver [Tue, 11 Jul 2017 18:34:40 +0000 (11:34 -0700)]
DO NOT MERGE Back-port ag/2491664

Bug: 62196835
Test: Verify overlays disappear on a11y capabilities
dialog.

Change-Id: Icbd00799e4b12cde9d17d3d0abbd38d9643b26c4

7 years agoMerge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev
Steven Ng [Tue, 16 May 2017 21:30:54 +0000 (21:30 +0000)]
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev
am: c07f39c791

Change-Id: I00f92abcf2acd828ab8e81ed0053f7afd9f0d994

7 years agoMerge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev
Steven Ng [Tue, 16 May 2017 21:17:58 +0000 (21:17 +0000)]
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev

7 years agoFix phishing attack in ChooseLockGeneric
Steven Ng [Thu, 11 May 2017 17:31:08 +0000 (18:31 +0100)]
Fix phishing attack in ChooseLockGeneric

Cherry-pick of 436256c36d69549c77320d073bef27649c1b1d6e

Test: 1) make and run SettingsTests. It passes.
      2) Manual test 1
         a) On a device supports fingerprint, set a password but not fingerprint.
         b) adb shell am start -a android.app.action.SET_NEW_PARENT_PROFILE_PASSWORD
         c) Confirm Lock password screen is shown
         d) Select "Skip fingerprint". There isn't a second lock password confirmation screen.
         e) A new password can be set successfully.
      3) Manual test 2
         a) Repeat step 2)a) - 2)c)
         b) Select "Fingerprint + PIN". There isn't a second lock password confirmation screen.
         c) A new password and fingerprint can be enrolled successfully.

Bug: 33059280
Change-Id: I1078c6e303fc41aeeb370e5d6518d1f16b5837f1
Merged-In: I1078c6e303fc41aeeb370e5d6518d1f16b5837f1

7 years agoDon't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e...
Phil Weaver [Fri, 12 May 2017 22:14:22 +0000 (22:14 +0000)]
Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4 am: adf8f8bc60 am: 9b8abd652a
am: 8247008239

Change-Id: Ieea167c11711139aff52c72c515b919240d7eb1a

7 years agoDon't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e...
Phil Weaver [Fri, 12 May 2017 22:11:56 +0000 (22:11 +0000)]
Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4 am: adf8f8bc60
am: 9b8abd652a

Change-Id: I1eec44668bbd578003d3cc57763808ec2a80f0fa

7 years agoDon't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e...
Phil Weaver [Fri, 12 May 2017 22:08:53 +0000 (22:08 +0000)]
Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4
am: adf8f8bc60

Change-Id: Id26b90f8d4afbf6e50bc8e43afced432c70dba68

7 years agoDon't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e...
Phil Weaver [Fri, 12 May 2017 22:07:24 +0000 (22:07 +0000)]
Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67
am: 11b6279ed4

Change-Id: I370c3f0ffc78f86b465d9721a753503b03d56d54

7 years agoDon't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e
Phil Weaver [Fri, 12 May 2017 22:05:52 +0000 (22:05 +0000)]
Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e
am: beb7f31d67

Change-Id: I13dc112b756569d68bddad1716db0e3979d0c150

7 years agoDon't enable a11y service if scary dialog obscured am: 9a1b4eb21f
Phil Weaver [Fri, 12 May 2017 22:02:53 +0000 (22:02 +0000)]
Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f
am: 5d6d70a50e

Change-Id: Ib4fca899498f1348263beff3908c24a9ec65c392

7 years agoDon't enable a11y service if scary dialog obscured
Phil Weaver [Fri, 12 May 2017 22:00:23 +0000 (22:00 +0000)]
Don't enable a11y service if scary dialog obscured
am: 9a1b4eb21f

Change-Id: I0a288cb9cef29d730ec82028cf0dc003970db734

7 years agoDon't enable a11y service if scary dialog obscured
Phil Weaver [Tue, 9 May 2017 17:51:32 +0000 (10:51 -0700)]
Don't enable a11y service if scary dialog obscured

Bug: 38134845
Test: Trivial back-port of ag/2066325; relying on treehugger
Change-Id: I784eebebe45847431e67aa9032f2f1367156a440

7 years agoAdd permission check to Intents used by Authenticator Settings. am: ea55e6331e am...
Dmitry Dementyev [Wed, 12 Apr 2017 20:21:39 +0000 (20:21 +0000)]
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a am: 0c07b38054  -s ours am: 22db6274bf  -s ours am: 13b12fd61d  -s ours am: 2d9593f8f1  -s ours am: 5f32a5b5f3  -s ours am: 56dc835f3c  -s ours am: b23bdee761  -s ours am: 704c02db08  -s ours am: 89657550ac  -s ours am: ed6872b3d5  -s ours
am: 43e154604a  -s ours

Change-Id: I5d559b468d1d6165162d78cbde84b45e05e7b5ec

7 years agoAdd permission check to Intents used by Authenticator Settings. am: ea55e6331e am...
Dmitry Dementyev [Wed, 12 Apr 2017 20:15:40 +0000 (20:15 +0000)]
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a am: 0c07b38054  -s ours am: 22db6274bf  -s ours am: 13b12fd61d  -s ours am: 2d9593f8f1  -s ours am: 5f32a5b5f3  -s ours am: 56dc835f3c  -s ours am: b23bdee761  -s ours am: 704c02db08  -s ours am: 89657550ac  -s ours
am: ed6872b3d5  -s ours

Change-Id: I0aafd94271cab6fd2fb9acebca3c41299ec9550f

7 years agoAdd permission check to Intents used by Authenticator Settings. am: ea55e6331e am...
Dmitry Dementyev [Wed, 12 Apr 2017 20:10:07 +0000 (20:10 +0000)]
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a am: 0c07b38054  -s ours am: 22db6274bf  -s ours am: 13b12fd61d  -s ours am: 2d9593f8f1  -s ours am: 5f32a5b5f3  -s ours am: 56dc835f3c  -s ours am: b23bdee761  -s ours am: 704c02db08  -s ours
am: 89657550ac  -s ours

Change-Id: I3bb7c6e6f2a8abcad3304c43e611df855e79dad9

7 years agoAdd permission check to Intents used by Authenticator Settings. am: ea55e6331e am...
Dmitry Dementyev [Wed, 12 Apr 2017 20:04:11 +0000 (20:04 +0000)]
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a am: 0c07b38054  -s ours am: 22db6274bf  -s ours am: 13b12fd61d  -s ours am: 2d9593f8f1  -s ours am: 5f32a5b5f3  -s ours am: 56dc835f3c  -s ours am: b23bdee761  -s ours
am: 704c02db08  -s ours

Change-Id: I29ab4a6fb0dfbd3f03b9be71f28ff9f36893bc59

7 years agoAdd permission check to Intents used by Authenticator Settings. am: ea55e6331e am...
Dmitry Dementyev [Wed, 12 Apr 2017 20:00:05 +0000 (20:00 +0000)]
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a am: 0c07b38054  -s ours am: 22db6274bf  -s ours am: 13b12fd61d  -s ours am: 2d9593f8f1  -s ours am: 5f32a5b5f3  -s ours am: 56dc835f3c  -s ours
am: b23bdee761  -s ours

Change-Id: Ie66bdaba9900b112cee1d9503a332b7bbe203283

7 years agoAdd permission check to Intents used by Authenticator Settings. am: ea55e6331e am...
Dmitry Dementyev [Wed, 12 Apr 2017 19:54:06 +0000 (19:54 +0000)]
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a am: 0c07b38054  -s ours am: 22db6274bf  -s ours am: 13b12fd61d  -s ours am: 2d9593f8f1  -s ours am: 5f32a5b5f3  -s ours
am: 56dc835f3c  -s ours

Change-Id: Iafcd0d4116683e0b40a9f98ef9ccf3d176ec0b32

7 years agoAdd permission check to Intents used by Authenticator Settings. am: ea55e6331e am...
Dmitry Dementyev [Wed, 12 Apr 2017 19:49:07 +0000 (19:49 +0000)]
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a am: 0c07b38054  -s ours am: 22db6274bf  -s ours am: 13b12fd61d  -s ours am: 2d9593f8f1  -s ours
am: 5f32a5b5f3  -s ours

Change-Id: I608a98d05d77b2e755f516ec60c64484c81437da

7 years agoAdd permission check to Intents used by Authenticator Settings. am: ea55e6331e am...
Dmitry Dementyev [Wed, 12 Apr 2017 19:44:05 +0000 (19:44 +0000)]
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a am: 0c07b38054  -s ours am: 22db6274bf  -s ours am: 13b12fd61d  -s ours
am: 2d9593f8f1  -s ours

Change-Id: Id5ccadb538d8986e86b614d9303a637d6661c482

7 years agoAdd permission check to Intents used by Authenticator Settings. am: ea55e6331e am...
Dmitry Dementyev [Wed, 12 Apr 2017 19:37:33 +0000 (19:37 +0000)]
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a am: 0c07b38054  -s ours am: 22db6274bf  -s ours
am: 13b12fd61d  -s ours

Change-Id: I20df71c6318262d701b6cb75aff56e9e99c6eaf5

7 years agoAdd permission check to Intents used by Authenticator Settings. am: ea55e6331e am...
Dmitry Dementyev [Wed, 12 Apr 2017 19:32:36 +0000 (19:32 +0000)]
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a am: 0c07b38054  -s ours
am: 22db6274bf  -s ours

Change-Id: Ieeeb4f1677f835787098dd75c4131be5960d6855

7 years agoAdd permission check to Intents used by Authenticator Settings. am: ea55e6331e am...
Dmitry Dementyev [Wed, 12 Apr 2017 19:26:32 +0000 (19:26 +0000)]
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a
am: 0c07b38054  -s ours

Change-Id: Ibb0be31c8bf222d0c823142e075db819a3a52047

7 years agoAdd permission check to Intents used by Authenticator Settings. am: ea55e6331e
Dmitry Dementyev [Wed, 12 Apr 2017 19:21:36 +0000 (19:21 +0000)]
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e
am: bac5163a9a

Change-Id: Ib70241c596aca047a096318eb2026634692f8620

7 years agoAdd permission check to Intents used by Authenticator Settings.
Dmitry Dementyev [Wed, 12 Apr 2017 19:16:01 +0000 (19:16 +0000)]
Add permission check to Intents used by Authenticator Settings.
am: ea55e6331e

Change-Id: Iafaa143dd3c3201f16d1e19cb150243fd5f88232

7 years agoAdd permission check to Intents used by Authenticator Settings.
Dmitry Dementyev [Wed, 15 Mar 2017 19:33:05 +0000 (12:33 -0700)]
Add permission check to Intents used by Authenticator Settings.

Setting shares system uid and can be used to bypass different security
checks.
We add proper handling for intents which resolve toexported=true
activities with permission filed.
Added nested preferences filtering.

Bug: 33123882
Test: manual tests
Change-Id: I3ba9c768fc4f8093dcf2eadc17f14c506ec5c327
Merged-In: Ib5bab7989fc44b4391f9050c6b18f81c58c09cf6

7 years agoresolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258...
Dmitry Dementyev [Thu, 9 Mar 2017 18:25:27 +0000 (18:25 +0000)]
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258 am: 3a5e567ab9 am: b7e2545217 am: def3eddb43 am: 3964c51bf2  -s ours am: f1fb452863 am: 2569925151
am: efb9f74486

Change-Id: I947fecd7b54fac9c3253decff4d635cad7706baa

7 years agoresolve merge conflicts of 3964c51bf2 to nyc-dev am: 0f04a5a93f am: 8c5c5b5cec
Dmitry Dementyev [Thu, 9 Mar 2017 18:25:11 +0000 (18:25 +0000)]
resolve merge conflicts of 3964c51bf2 to nyc-dev am: 0f04a5a93f am: 8c5c5b5cec
am: 3b5b2d6d20

Change-Id: I52945a6de0678ae91a1eba0201dc252402146260

7 years agoresolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258...
Dmitry Dementyev [Thu, 9 Mar 2017 18:22:27 +0000 (18:22 +0000)]
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258 am: 3a5e567ab9 am: b7e2545217 am: def3eddb43 am: 3964c51bf2  -s ours am: f1fb452863
am: 2569925151

Change-Id: I9462ba01dda65034a82df27a0b7aaf2de14591b0

7 years agoresolve merge conflicts of 3964c51bf2 to nyc-dev am: 0f04a5a93f
Dmitry Dementyev [Thu, 9 Mar 2017 18:22:11 +0000 (18:22 +0000)]
resolve merge conflicts of 3964c51bf2 to nyc-dev am: 0f04a5a93f
am: 8c5c5b5cec

Change-Id: I56f7364b5b70fe41a5d09fbaf334c0e15f073750

7 years agoresolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258...
Dmitry Dementyev [Thu, 9 Mar 2017 18:19:26 +0000 (18:19 +0000)]
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258 am: 3a5e567ab9 am: b7e2545217 am: def3eddb43 am: 3964c51bf2  -s ours
am: f1fb452863

Change-Id: I074be985f7e09f1d7bac6936d7cadc25a9b8afba

7 years agoresolve merge conflicts of 3964c51bf2 to nyc-dev
Dmitry Dementyev [Thu, 9 Mar 2017 18:19:10 +0000 (18:19 +0000)]
resolve merge conflicts of 3964c51bf2 to nyc-dev
am: 0f04a5a93f

Change-Id: I5bb82c0b56e43903d10304007bc17165be3c23f9

7 years agoresolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258...
Dmitry Dementyev [Thu, 9 Mar 2017 18:16:23 +0000 (18:16 +0000)]
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258 am: 3a5e567ab9 am: b7e2545217 am: def3eddb43
am: 3964c51bf2  -s ours

Change-Id: I8f8c6bd49cc10addae1408f1cfb8b2200184a999

7 years agoresolve merge conflicts of 3964c51bf2 to nyc-dev
Dmitry Dementyev [Thu, 9 Mar 2017 00:32:00 +0000 (16:32 -0800)]
resolve merge conflicts of 3964c51bf2 to nyc-dev

Bug: 33123882
Test: manual tests
Merged-In: If68343d155364654fa7db55ace3fb3c4db508c7e
Change-Id: I17ceca883819a161c4eab2a414abf0b64c320378

7 years agoresolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258...
Dmitry Dementyev [Wed, 8 Mar 2017 19:17:42 +0000 (19:17 +0000)]
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258 am: 3a5e567ab9 am: b7e2545217
am: def3eddb43

Change-Id: I103086932e0f5071b1fa554a9e11a524b0d36d7d

7 years agoresolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258...
Dmitry Dementyev [Wed, 8 Mar 2017 19:15:40 +0000 (19:15 +0000)]
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258 am: 3a5e567ab9
am: b7e2545217

Change-Id: I40643a3a88c3ec9344604917dd0e765cd9078f29