OSDN Git Service
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Steven Ng [Tue, 16 May 2017 21:17:58 +0000 (21:17 +0000)]
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Dmitry Dementyev [Wed, 8 Mar 2017 19:13:10 +0000 (19:13 +0000)]
resolve merge conflicts of
75ae46d035 to lmp-mr1-dev am:
e24780ed4c am:
5c4276a258
am:
3a5e567ab9
Change-Id: Ie14fd1ef35f12fffadf4e241e3cd8146a1063d8a
Dmitry Dementyev [Wed, 8 Mar 2017 19:11:13 +0000 (19:11 +0000)]
resolve merge conflicts of
75ae46d035 to lmp-mr1-dev am:
e24780ed4c
am:
5c4276a258
Change-Id: Iba7445a15febacfd49ee8a415d8b5a02691b084b
Dmitry Dementyev [Wed, 8 Mar 2017 19:08:40 +0000 (19:08 +0000)]
resolve merge conflicts of
75ae46d035 to lmp-mr1-dev
am:
e24780ed4c
Change-Id: I2fe71909a4b3873fc4e14f7c28b50b0418f85dd1
Dmitry Dementyev [Wed, 8 Mar 2017 03:47:52 +0000 (19:47 -0800)]
resolve merge conflicts of
75ae46d035 to lmp-mr1-dev
Change-Id: Ib80d006bbd7b76396b4941e001f5c69fb7b643fa
Bug:
33123882
Test: manual tests:
Dmitry Dementyev [Tue, 14 Feb 2017 21:15:36 +0000 (13:15 -0800)]
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
Junda Liu [Fri, 17 Feb 2017 18:02:35 +0000 (18:02 +0000)]
Ignore orientation change to preserve ApnEditor.
am:
f414d58ddf
Change-Id: I76b7df13239829f0fbba24db30babf640b2506fd
Junda Liu [Sat, 4 Feb 2017 00:39:23 +0000 (16:39 -0800)]
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
76ad635ef7b5604cb314e244e1d7c42df020e743)
Fan Zhang [Tue, 1 Nov 2016 17:21:36 +0000 (17:21 +0000)]
Fix crash when opening account sync detail for external app
am:
c9cdc25f41
Change-Id: Ic8016695966d64c02c4e2fbe37703db8c771930e
Fan Zhang [Mon, 31 Oct 2016 19:45:49 +0000 (12:45 -0700)]
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
e3ad2b56c31f3f9fa751647197b8b2ca5cdb0fb6)
Bill Yi [Thu, 27 Oct 2016 05:27:37 +0000 (05:27 +0000)]
Import translations. DO NOT MERGE am:
bb6af9902d -s ours
am:
061b294714 -s ours
Change-Id: If6f1925ffdab47128db255040e97a45733f819d5
Bill Yi [Thu, 27 Oct 2016 05:27:22 +0000 (05:27 +0000)]
Import translations. DO NOT MERGE
am:
e7f9b0b30b -s ours
Change-Id: I4297eed21e6b8854801a3e9a6f9904b1dadaab72
Bill Yi [Thu, 27 Oct 2016 05:22:55 +0000 (05:22 +0000)]
Import translations. DO NOT MERGE
am:
bb6af9902d -s ours
Change-Id: I601e2eb4a89830873bee3f05b77d90b0e9dff9bb
Bill Yi [Thu, 27 Oct 2016 04:04:20 +0000 (21:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie7733c16a2d1b8502a2b33e10fe0c4fa0e6d9138
Auto-generated-cl: translation import
Bill Yi [Thu, 27 Oct 2016 03:51:47 +0000 (20:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: I593dba1b6fda93a08279272c8e4061c464899afc
Auto-generated-cl: translation import
Steven Ng [Tue, 25 Oct 2016 22:15:03 +0000 (22:15 +0000)]
Nexus imprint setting is missing while adding corp account from SUW
am:
378dec1495
Change-Id: I829c9738c70ec8242fb2c3fdcf7eecd5ff39df7c
Steven Ng [Tue, 25 Oct 2016 16:23:30 +0000 (17:23 +0100)]
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
Bill Yi [Tue, 25 Oct 2016 06:30:52 +0000 (06:30 +0000)]
Import translations. DO NOT MERGE am:
a6d9842695 -s ours
am:
c027907edc -s ours
Change-Id: I09c421885fb40a57e309a083413797bac5de053b
Bill Yi [Tue, 25 Oct 2016 06:30:37 +0000 (06:30 +0000)]
Import translations. DO NOT MERGE
am:
475763d01c -s ours
Change-Id: I4b54504ffad69e916590de47d505979b82325827
Bill Yi [Tue, 25 Oct 2016 06:30:08 +0000 (06:30 +0000)]
Import translations. DO NOT MERGE
am:
a6d9842695 -s ours
Change-Id: Ic902f00f1abc643ecfb2e567d7368815bf727d62
Bill Yi [Mon, 24 Oct 2016 19:40:25 +0000 (12:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic23d8689a23264722dd70856138fbda6a214e7cb
Auto-generated-cl: translation import
Bill Yi [Mon, 24 Oct 2016 19:27:49 +0000 (12:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie8400c22cf5931503997d0dc93b0358ee40c89d7
Auto-generated-cl: translation import
Doris Ling [Fri, 21 Oct 2016 23:44:19 +0000 (23:44 +0000)]
Ensure that the gesture animation video is paused properly.
am:
4245ad4771
Change-Id: Ib6bd653fe0f1fd0859c37df4655908e67ecc4444
Doris Ling [Fri, 21 Oct 2016 21:28:54 +0000 (14:28 -0700)]
Ensure that the gesture animation video is paused properly.
Add the handling to pause the animation video when user navigates away
from the gesture settings.
Test: Manual - play gesture animation videos, then switch to another app
in recents. Verifies from logcat that NuPlayerDriver is not active.
Fix:
32064123
Change-Id: I3d0fb3946e4d0d77a686aa97cfabe667862cac17
Matthew Fritze [Fri, 21 Oct 2016 16:36:20 +0000 (16:36 +0000)]
Merge "Support tile title text line wraps" into nyc-mr1-dev
am:
f5cd60372c
Change-Id: Ie0d699bcc355519060df04b46b213ce368e47e6a
Matthew Fritze [Fri, 21 Oct 2016 16:36:19 +0000 (16:36 +0000)]
Support tile title text line wraps
am:
0f813d668d
Change-Id: I47a4f7f95f0bce43a55e661209d48142f82e5b42
TreeHugger Robot [Fri, 21 Oct 2016 16:30:49 +0000 (16:30 +0000)]
Merge "Support tile title text line wraps" into nyc-mr1-dev
Matthew Fritze [Thu, 20 Oct 2016 22:35:29 +0000 (15:35 -0700)]
Support tile title text line wraps
Change-Id: Ice430d03877618aacad21e5ee6167516f60f02fd
Fixes:
32239411
Test: Manual
Fan Zhang [Thu, 20 Oct 2016 20:25:38 +0000 (20:25 +0000)]
Merge "Fix help & feedback link in data usage summary screen." into nyc-mr1-dev
am:
08254e5b4f
Change-Id: Ia9c30a0a03a1dcaec42573c3578f5a1ed80aa9b6
Fan Zhang [Thu, 20 Oct 2016 20:25:37 +0000 (20:25 +0000)]
Fix help & feedback link in data usage summary screen.
am:
9b52836251
Change-Id: I1417eebbf5218baa24a79f2f1988844b8d06d674
TreeHugger Robot [Thu, 20 Oct 2016 20:18:44 +0000 (20:18 +0000)]
Merge "Fix help & feedback link in data usage summary screen." into nyc-mr1-dev
Bill Yi [Thu, 20 Oct 2016 16:33:20 +0000 (16:33 +0000)]
Import translations. DO NOT MERGE am:
4bfccb32a7 -s ours
am:
4559d2bfac -s ours
Change-Id: Iff8ca804ae251a0462f148a236e7b4e8c9dd3e4d
Bill Yi [Thu, 20 Oct 2016 16:25:35 +0000 (16:25 +0000)]
Import translations. DO NOT MERGE
am:
4bfccb32a7 -s ours
Change-Id: I7c16649111b0057307773f7674c11c1aa9732c4c
Bill Yi [Thu, 20 Oct 2016 16:17:21 +0000 (16:17 +0000)]
Import translations. DO NOT MERGE
am:
7e6e9220da -s ours
Change-Id: Ibe7e7a4797602978d09a44aab39f49045f029748
Fan Zhang [Thu, 20 Oct 2016 16:06:12 +0000 (09:06 -0700)]
Fix help & feedback link in data usage summary screen.
The fragment was not providing the correct string for help & feedback
button, causing no result page when user navigates to help article page
from actionbar overflow menu.
Change-Id: I076846c44d4fc95efea743f019a7ad4aab47f214
Fixes:
32291069
Test: manual
Bill Yi [Thu, 20 Oct 2016 14:52:52 +0000 (07:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2490d08d85215767e05bf193c3e352c3ab7a7ce9
Auto-generated-cl: translation import
Bill Yi [Thu, 20 Oct 2016 14:48:07 +0000 (07:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: I60964278429db5003b317b04e53324fc312116d5
Auto-generated-cl: translation import
Anna Galusza [Thu, 20 Oct 2016 03:38:11 +0000 (03:38 +0000)]
Merge "Fix insufficint contrast on Vision Settings toggles." into nyc-mr1-dev
am:
ee502d5037
Change-Id: I23a6c8eb6911902fc9b9ecab8bb87e38c73371b5
Anna Galusza [Thu, 20 Oct 2016 03:38:11 +0000 (03:38 +0000)]
Fix insufficint contrast on Vision Settings toggles.
am:
e212817785
Change-Id: I9969b046d52d6aff86fe6b0f5d44cce2cf49e8dd
Anna Galusza [Thu, 20 Oct 2016 03:32:22 +0000 (03:32 +0000)]
Merge "Fix insufficint contrast on Vision Settings toggles." into nyc-mr1-dev
Anna Galusza [Mon, 17 Oct 2016 19:23:08 +0000 (12:23 -0700)]
Fix insufficint contrast on Vision Settings toggles.
Bug:
29161887
Change-Id: I633ed3cf0fa00d3b697377118580471afaf30132
Adrian Roos [Tue, 18 Oct 2016 22:16:39 +0000 (22:16 +0000)]
Merge "Separate ambient display triggers" into nyc-mr1-dev
am:
ee5eef1492
Change-Id: Id045b4f47d8052b8e058522d69d91f9e1a9bba48
Adrian Roos [Tue, 18 Oct 2016 22:07:11 +0000 (22:07 +0000)]
Separate ambient display triggers
am:
82829ee0b1
Change-Id: I9f58e13648def7e982ce2966e789147d07b14f62
Adrian Roos [Tue, 18 Oct 2016 22:00:04 +0000 (22:00 +0000)]
Merge "Separate ambient display triggers" into nyc-mr1-dev
Lei Yu [Tue, 18 Oct 2016 16:54:04 +0000 (16:54 +0000)]
Merge "Suspend action in security patch when browser is disabled" into nyc-mr1-dev
am:
7fee46383f
Change-Id: I0adb924d05bed16bb6415f2b8edf69e509d7fe72
jackqdyulei [Tue, 18 Oct 2016 16:54:03 +0000 (16:54 +0000)]
Suspend action in security patch when browser is disabled
am:
013da34209
Change-Id: I408fadd1b4d5a3455eb70dc808efe18e258f26c0
Lei Yu [Tue, 18 Oct 2016 16:45:35 +0000 (16:45 +0000)]
Merge "Suspend action in security patch when browser is disabled" into nyc-mr1-dev
Bill Yi [Tue, 18 Oct 2016 05:40:29 +0000 (05:40 +0000)]
Import translations. DO NOT MERGE am:
6515783df6 -s ours
am:
37c5dd0fe3 -s ours
Change-Id: Ia6d04b243b2338687963f234374d44a76a8bfae8
Bill Yi [Tue, 18 Oct 2016 05:40:02 +0000 (05:40 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
5ffabbe58b -s ours
Change-Id: I97a96da052f14ecd9901ef7aee42cfdbaf284cbf
Bill Yi [Tue, 18 Oct 2016 05:40:01 +0000 (05:40 +0000)]
Import translations. DO NOT MERGE
am:
ccde0787b8 -s ours
Change-Id: I7ee7d06fa217a520809ade396be78dddc63b3109
Bill Yi [Tue, 18 Oct 2016 05:37:33 +0000 (05:37 +0000)]
Import translations. DO NOT MERGE
am:
6515783df6 -s ours
Change-Id: I4afd6c7910dde3c52771687f6fa8bfbe55e56894
TreeHugger Robot [Tue, 18 Oct 2016 05:30:53 +0000 (05:30 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev