Commit Graph

27669 Commits

Author SHA1 Message Date
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
254bbe84a3 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
2017-07-12 22:56:17 +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
Steven Ng
c07f39c791 Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev 2017-05-16 21:17:59 +00:00
Steven Ng
741f99ad22 Fix phishing attack in ChooseLockGeneric
Cherry-pick of 436256c36d

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
2017-05-15 17:52:44 +00:00
Phil Weaver
8247008239 Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4 am: adf8f8bc60
am: 9b8abd652a

Change-Id: I1eec44668bbd578003d3cc57763808ec2a80f0fa
2017-05-12 22:11:56 +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
Phil Weaver
11b6279ed4 Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e
am: beb7f31d67

Change-Id: I13dc112b756569d68bddad1716db0e3979d0c150
2017-05-12 22:05:52 +00:00
Phil Weaver
beb7f31d67 Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f
am: 5d6d70a50e

Change-Id: Ib4fca899498f1348263beff3908c24a9ec65c392
2017-05-12 22:02:53 +00:00
Phil Weaver
5d6d70a50e Don't enable a11y service if scary dialog obscured
am: 9a1b4eb21f

Change-Id: I0a288cb9cef29d730ec82028cf0dc003970db734
2017-05-12 22:00:23 +00:00
Phil Weaver
9a1b4eb21f Don't enable a11y service if scary dialog obscured
Bug: 38134845
Test: Trivial back-port of ag/2066325; relying on treehugger
Change-Id: I784eebebe45847431e67aa9032f2f1367156a440
2017-05-09 10:51:32 -07:00
Dmitry Dementyev
43e154604a 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
2017-04-12 20:15:40 +00:00
Dmitry Dementyev
ed6872b3d5 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
2017-04-12 20:10:07 +00:00
Dmitry Dementyev
89657550ac 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
2017-04-12 20:04:11 +00:00
Dmitry Dementyev
704c02db08 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
2017-04-12 20:00:05 +00:00
Dmitry Dementyev
b23bdee761 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
2017-04-12 19:54:06 +00:00
Dmitry Dementyev
56dc835f3c 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
2017-04-12 19:49:07 +00:00
Dmitry Dementyev
5f32a5b5f3 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
2017-04-12 19:44:05 +00:00
Dmitry Dementyev
2d9593f8f1 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
2017-04-12 19:37:33 +00:00
Dmitry Dementyev
13b12fd61d Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a am: 0c07b38054 -s ours
am: 22db6274bf  -s ours

Change-Id: Ieeeb4f1677f835787098dd75c4131be5960d6855
2017-04-12 19:32:36 +00:00
Dmitry Dementyev
22db6274bf Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a
am: 0c07b38054  -s ours

Change-Id: Ibb0be31c8bf222d0c823142e075db819a3a52047
2017-04-12 19:26:32 +00:00
Dmitry Dementyev
0c07b38054 Add permission check to Intents used by Authenticator Settings. am: ea55e6331e
am: bac5163a9a

Change-Id: Ib70241c596aca047a096318eb2026634692f8620
2017-04-12 19:21:36 +00:00
Dmitry Dementyev
bac5163a9a Add permission check to Intents used by Authenticator Settings.
am: ea55e6331e

Change-Id: Iafaa143dd3c3201f16d1e19cb150243fd5f88232
2017-04-12 19:16:01 +00:00
Dmitry Dementyev
ea55e6331e 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
2017-03-28 13:53:10 -07:00
Dmitry Dementyev
efb9f74486 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
2017-03-09 18:22:27 +00:00
Dmitry Dementyev
3b5b2d6d20 resolve merge conflicts of 3964c51bf2 to nyc-dev am: 0f04a5a93f
am: 8c5c5b5cec

Change-Id: I56f7364b5b70fe41a5d09fbaf334c0e15f073750
2017-03-09 18:22:11 +00:00