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
Dmitry Dementyev
2569925151
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
2017-03-09 18:19:26 +00:00
Dmitry Dementyev
8c5c5b5cec
resolve merge conflicts of 3964c51bf2
to nyc-dev
...
am: 0f04a5a93f
Change-Id: I5bb82c0b56e43903d10304007bc17165be3c23f9
2017-03-09 18:19:10 +00:00
Dmitry Dementyev
f1fb452863
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
2017-03-09 18:16:23 +00:00
Dmitry Dementyev
0f04a5a93f
resolve merge conflicts of 3964c51bf2
to nyc-dev
...
Bug: 33123882
Test: manual tests
Merged-In: If68343d155364654fa7db55ace3fb3c4db508c7e
Change-Id: I17ceca883819a161c4eab2a414abf0b64c320378
2017-03-08 17:12:40 -08:00
Dmitry Dementyev
3964c51bf2
resolve merge conflicts of 75ae46d035
to lmp-mr1-dev am: e24780ed4c
am: 5c4276a258
am: 3a5e567ab9
am: b7e2545217
...
am: def3eddb43
Change-Id: I103086932e0f5071b1fa554a9e11a524b0d36d7d
2017-03-08 19:17:42 +00:00
Dmitry Dementyev
def3eddb43
resolve merge conflicts of 75ae46d035
to lmp-mr1-dev am: e24780ed4c
am: 5c4276a258
am: 3a5e567ab9
...
am: b7e2545217
Change-Id: I40643a3a88c3ec9344604917dd0e765cd9078f29
2017-03-08 19:15:40 +00:00
Dmitry Dementyev
b7e2545217
resolve merge conflicts of 75ae46d035
to lmp-mr1-dev am: e24780ed4c
am: 5c4276a258
...
am: 3a5e567ab9
Change-Id: Ie14fd1ef35f12fffadf4e241e3cd8146a1063d8a
2017-03-08 19:13:10 +00:00
Dmitry Dementyev
3a5e567ab9
resolve merge conflicts of 75ae46d035
to lmp-mr1-dev am: e24780ed4c
...
am: 5c4276a258
Change-Id: Iba7445a15febacfd49ee8a415d8b5a02691b084b
2017-03-08 19:11:13 +00:00
Dmitry Dementyev
5c4276a258
resolve merge conflicts of 75ae46d035
to lmp-mr1-dev
...
am: e24780ed4c
Change-Id: I2fe71909a4b3873fc4e14f7c28b50b0418f85dd1
2017-03-08 19:08:40 +00:00
Dmitry Dementyev
e24780ed4c
resolve merge conflicts of 75ae46d035
to lmp-mr1-dev
...
Change-Id: Ib80d006bbd7b76396b4941e001f5c69fb7b643fa
Bug: 33123882
Test: manual tests:
2017-03-07 19:52:02 -08:00
Dmitry Dementyev
75ae46d035
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: Ib5bab7989fc44b4391f9050c6b18f81c58c09cf6
2017-02-21 11:05:45 -08:00
Junda Liu
f414d58ddf
Ignore orientation change to preserve ApnEditor.
...
Test: manually w/ Vzw and Tmo SIM on marlin. UI rotates while preserving
all values
Bug: b/34956985
Change-Id: I1db34893fd91f99e38913565e7b67ccbfdcb0c93
(cherry picked from commit 76ad635ef7
)
2017-02-08 18:04:24 +00:00
Fan Zhang
c9cdc25f41
Fix crash when opening account sync detail for external app
...
Bug: 32426306
Test: Manual, and added unit test
Change-Id: I8703c9a13a60e57d7dd2bab2ae3cf6be362e351a
(cherry picked from commit e3ad2b56c3
)
2016-10-31 21:57:36 +00:00
Bill Yi
061b294714
Import translations. DO NOT MERGE
...
am: bb6af9902d
-s ours
Change-Id: I601e2eb4a89830873bee3f05b77d90b0e9dff9bb
2016-10-27 05:22:55 +00:00
Bill Yi
bb6af9902d
Import translations. DO NOT MERGE
...
Change-Id: Ie7733c16a2d1b8502a2b33e10fe0c4fa0e6d9138
Auto-generated-cl: translation import
2016-10-26 21:04:20 -07:00
Bill Yi
e7f9b0b30b
Import translations. DO NOT MERGE
...
Change-Id: I593dba1b6fda93a08279272c8e4061c464899afc
Auto-generated-cl: translation import
2016-10-26 20:51:47 -07:00
Steven Ng
378dec1495
Nexus imprint setting is missing while adding corp account from SUW
...
+ This is caused by the encryption interstitial result code not handled
in ChooseLockGeneric. Change the request code of launching encryption
interstitial screen to CHOOSE_LOCK_BEFORE_FINGERPRINT_REQUEST if it
is set new password flow.
Testing
Test: See below
1) Auto
make RunSettingsRoboTests
2) Manual
On a device (Nexus 5x) that shows encryption interstital screen and
supports fingerprint.
1) Nexus imprint flow (regression test)
Fingerprint can be enrolled with the following flow.
Settings > Security > Nexus Imprint > FingerprintEnrollIntroduction
> ChooseLockGeneric (Unlock selection) > Encryption Interstitial
> Password setup > Notification Interstitial
> Find sensor and fingerprint enrollment
2) Set new password test
i) $ adb shell am start -a android.app.action.SET_NEW_PASSWORD
ii) Click Nexus Imprint + Pattern.
iii) Choose "Require pattern to start device"
iv) Set a pattern lock.
v) Choose any of the notification behavior.
vi) Can enroll a fingerprint.
Bug: 32382952
Change-Id: Ie66ffca2e8c3cc46b5e8b619bd35986e4f41d5ab
2016-10-25 20:01:23 +00:00
Bill Yi
c027907edc
Import translations. DO NOT MERGE
...
am: a6d9842695
-s ours
Change-Id: Ic902f00f1abc643ecfb2e567d7368815bf727d62
2016-10-25 06:30:08 +00:00
Bill Yi
a6d9842695
Import translations. DO NOT MERGE
...
Change-Id: Ic23d8689a23264722dd70856138fbda6a214e7cb
Auto-generated-cl: translation import
2016-10-24 12:40:25 -07:00
Bill Yi
475763d01c
Import translations. DO NOT MERGE
...
Change-Id: Ie8400c22cf5931503997d0dc93b0358ee40c89d7
Auto-generated-cl: translation import
2016-10-24 12:27:49 -07:00