OSDN Git Service
Suprabh Shukla [Wed, 16 Aug 2017 19:55:01 +0000 (19:55 +0000)]
Disabling the activate button when paused am:
9ffee0d534 am:
d27e28eab7 am:
93a9e9f7f2 -s ours am:
78a9d598f1 -s ours am:
0dba51f9f0 -s ours am:
7bd8e120cb -s ours
am:
d22de194f5 -s ours
Change-Id: I953f903e7298541160ed8c17f274a832618c152e
Suprabh Shukla [Wed, 16 Aug 2017 19:51:02 +0000 (19:51 +0000)]
Disabling the activate button when paused am:
9ffee0d534 am:
d27e28eab7 am:
93a9e9f7f2 -s ours am:
78a9d598f1 -s ours am:
0dba51f9f0 -s ours
am:
7bd8e120cb -s ours
Change-Id: I2f06097aaaa7e312a0b066e2f92536968d31003f
Suprabh Shukla [Wed, 16 Aug 2017 19:47:06 +0000 (19:47 +0000)]
Disabling the activate button when paused am:
9ffee0d534 am:
d27e28eab7 am:
93a9e9f7f2 -s ours am:
78a9d598f1 -s ours
am:
0dba51f9f0 -s ours
Change-Id: Ife5e67db0c3866b3bae77d1d0f476bc7f30bf389
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
Suprabh Shukla [Wed, 16 Aug 2017 19:43:31 +0000 (19:43 +0000)]
Disabling the activate button when paused am:
9ffee0d534 am:
d27e28eab7 am:
93a9e9f7f2 -s ours
am:
78a9d598f1 -s ours
Change-Id: Id94c32bb309dfe9808b30a19fbd42334f3f9f19b
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
Suprabh Shukla [Wed, 16 Aug 2017 19:38:35 +0000 (19:38 +0000)]
Disabling the activate button when paused am:
9ffee0d534 am:
d27e28eab7
am:
93a9e9f7f2 -s ours
Change-Id: If5bfd68d2a899813edb2ab550d8a2c0ed2db8d63
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
Suprabh Shukla [Wed, 16 Aug 2017 19:33:30 +0000 (19:33 +0000)]
Disabling the activate button when paused am:
9ffee0d534
am:
d27e28eab7
Change-Id: I975f6132333510ac6b40bf9683296885bdc54f05
Suprabh Shukla [Wed, 16 Aug 2017 19:27:40 +0000 (19:27 +0000)]
Disabling the activate button when paused
am:
9ffee0d534
Change-Id: I76f0f749ad159b50520e6f95d9bfaf2d8cca3429
Suprabh Shukla [Wed, 16 Aug 2017 19:26:00 +0000 (19:26 +0000)]
Disabling the activate button when paused
am:
af5d8b9b03
Change-Id: Icf4cd1c4ff5a520a72f9deedf85c486e892da250
Suprabh Shukla [Tue, 15 Aug 2017 02:22:17 +0000 (02:22 +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.
Bug:
35056974
Change-Id: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Merged-In: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
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
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
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
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
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
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
Phil Weaver [Tue, 18 Jul 2017 23:21:17 +0000 (23:21 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev
Phil Weaver [Tue, 18 Jul 2017 21:23:17 +0000 (21:23 +0000)]
Merge "Back-port ag/
2491664" into nyc-dev
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
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
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
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
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
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
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
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
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
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
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
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
Phil Weaver [Tue, 18 Jul 2017 18:26:16 +0000 (18:26 +0000)]
Back-port ag/
2491664
am:
1d21738bd6
Change-Id: I30088c2cb1b8c343d21e0b095700df472127c612
Phil Weaver [Tue, 18 Jul 2017 18:19:39 +0000 (18:19 +0000)]
Merge "Back-port ag/
2491664" into lmp-dev
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
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
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
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 [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
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
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: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: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
Bill Yi [Mon, 19 Sep 2016 16:38:48 +0000 (09:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I28c47f226372a174128aeceb5d61b686e7db742b
Auto-generated-cl: translation import
Maurice Lam [Tue, 6 Sep 2016 23:18:46 +0000 (23:18 +0000)]
[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am:
c94f2b93af am:
d278da7952 am:
94a0fa5759
am:
746dff40ba -s ours
Change-Id: I304081ab8e9ddaeb48af51cc07c4d3e131e7b13b
Maurice Lam [Tue, 6 Sep 2016 23:14:25 +0000 (23:14 +0000)]
[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am:
c94f2b93af am:
d278da7952
am:
94a0fa5759
Change-Id: I76460eee64ad7bc84d67379dc4f952deb2232130
Maurice Lam [Tue, 6 Sep 2016 23:11:17 +0000 (23:11 +0000)]
[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am:
c94f2b93af
am:
d278da7952
Change-Id: I771b15c4c94314f7fb3f1d3d3734b0c97a35f782
Maurice Lam [Tue, 6 Sep 2016 23:08:45 +0000 (23:08 +0000)]
[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE
am:
c94f2b93af
Change-Id: Ib66b9b9d6b97fe1299a24b0c92991b4bd6a46656
TreeHugger Robot [Tue, 6 Sep 2016 23:07:26 +0000 (23:07 +0000)]
Merge "Null check intent before starting "learn more"." into nyc-dev
Maurice Lam [Fri, 2 Sep 2016 23:34:38 +0000 (16:34 -0700)]
[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE
Remove the learn more link during setup wizard, because HelpUtils is
returning null for the intent while the device is not provisioned.
Bug:
31246856
Change-Id: I4cf5c282f170188aef98a02d3b96af5e63ea7f39
Maurice Lam [Fri, 2 Sep 2016 00:10:59 +0000 (17:10 -0700)]
Remove help links when device is not provisioned. DO NOT MERGE
Bug:
31246856
Change-Id: Id638de8ab1c6b815d62916a584892be84cabe1ae
Andrew Sapperstein [Tue, 3 May 2016 01:28:21 +0000 (18:28 -0700)]
Null check intent before starting "learn more".
It is possible in certain build configurations to have an invalid
link. Instead of crashing, swallow the error and write to logs.
BUG:
28381984
Fixes:
31246856
Change-Id: I19f20b96afb42758187707f1b86a5817e8d737a8
(cherry picked from commit
6561d4870f031395316cf2fc956f69c306f04ae4)
Doris Ling [Wed, 31 Aug 2016 21:27:19 +0000 (14:27 -0700)]
Fix NullPointerException when refreshing wifi preferences.
AccessPointPreference.refresh() is being called in different threads.
The refresh of the preference should only be updated in the main thread.
When access point updates is received not in the main thread, will post
the refreshing of the preference to the message queue to make the update
on the UI thread.
Test: auto - run monkey to verify there is no ANR or crash
manual - go to Settings->Wifi, toggle on/off many times and verify
there is no crash.
Change-Id: I656a70ecf2e7b9446c7b95b6b42ab19a5cc2e51c
Fixes:
30902893
Doris Ling [Tue, 30 Aug 2016 01:44:41 +0000 (18:44 -0700)]
Remove preference "Searching for Wi-Fi networks..."
When we add the preference "Searching for Wi-Fi networks...", we didn't
provide a key to the preference. As a result, each time when we get
access point update and try to show such tile, it creates a new one, and
results in multiple entries of such tile. Adding a key to the preference
will prevent the multiple entry from being added.
Test: Manual -
1. Turn wifi off and on several times, verify that there is only one entry
of "Searching for Wi-Fi networks..." when initializing the wifi access
point list.
2. Verifies that when the access point list is established, the
"Searching for Wi-Fi networks..." entry is gone.
Change-Id: Iaad329d89f8e4b52129d0661501aa34fbd956692
Change-Id: I1bfa77051e068926e8c876a89adf14d143970e7e
Fixes:
31143961
Jason Monk [Mon, 25 Jul 2016 14:37:39 +0000 (10:37 -0400)]
Fix multiple bluetooth devices bug
Was bug in some code trying to handle preference animations better.
Since those animations are all disabled now, just remove everything
again and re-add it.
Change-Id: If1ce07a8f2b4144d95a95cec6ebb1b423644825a
Fixes:
29314480
(cherry picked from commit
6666f9cc37ac8f9b99c6a174b1478924ed8fc6cd)
Fan Zhang [Wed, 24 Aug 2016 21:52:49 +0000 (14:52 -0700)]
Don't remove wifi preferences when updating AP to avoid GC.
Bug:
30870531
Removing wifi preferences every time will force update create a new set
of preferences, which leads to higher chance of GC.
Change-Id: Ifea2f63a3b54fa0d5861fb34a348d81e99bcab68
Jason Monk [Tue, 19 Jul 2016 20:31:15 +0000 (20:31 +0000)]
Merge "Pre-setup restrictions" into nyc-dev
Jason Monk [Fri, 15 Jul 2016 14:08:40 +0000 (14:08 +0000)]
Pre-setup restrictions DO NOT MERGE am:
e6ad6e866b am:
2d21d1b9cf am:
68d53c0481
am:
e67f458667 -s ours
Change-Id: Ic5c066a81be1fe3b884cf1c9ead6c7c276a12fd1
Jason Monk [Fri, 15 Jul 2016 14:05:59 +0000 (14:05 +0000)]
Pre-setup restrictions DO NOT MERGE am:
e6ad6e866b am:
2d21d1b9cf
am:
68d53c0481
Change-Id: Ic501eb9b08f18eb3e9f3e95d64aae511815db268
Jason Monk [Fri, 15 Jul 2016 14:03:03 +0000 (14:03 +0000)]
Pre-setup restrictions DO NOT MERGE am:
e6ad6e866b
am:
2d21d1b9cf
Change-Id: I1fc62827de765434ac88a7cb75d63febb074b565
Jason Monk [Fri, 15 Jul 2016 13:59:59 +0000 (13:59 +0000)]
Pre-setup restrictions DO NOT MERGE
am:
e6ad6e866b
Change-Id: I0bfc276c9bf0e3d6320cc9aa8c77f77899b69e04
Bill Yi [Mon, 11 Jul 2016 19:42:47 +0000 (12:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I945ac4865ce29fb45b0e0935cadbdc0dd3ab3ce7
Auto-generated-cl: translation import
Bill Yi [Wed, 6 Jul 2016 02:42:12 +0000 (19:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idce951754c8e74f8e6370dc1ad03cebfce4db3c6
Auto-generated-cl: translation import
Jason Monk [Thu, 30 Jun 2016 15:26:08 +0000 (11:26 -0400)]
Pre-setup restrictions
- Don't let user settings run
Bug:
29194585
Change-Id: Ia9c46c7ba04ce2809304bebe8a4c5cdac2108611
Jason Monk [Thu, 30 Jun 2016 15:26:08 +0000 (11:26 -0400)]
Pre-setup restrictions DO NOT MERGE
- Prevent external tiles from system apps
- Don't let user settings run
- Disable help
Bug:
29194585
Change-Id: I74ab8aaab62d62cc4dbbdf3164429a503f3a572b
Bill Yi [Thu, 30 Jun 2016 01:34:49 +0000 (18:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idaf99e158ee704e8017b7cb832e7f2dda16ff7bd
Auto-generated-cl: translation import
Jason Monk [Mon, 27 Jun 2016 18:36:21 +0000 (18:36 +0000)]
Merge "Fix DND conditional null state" into nyc-dev
Jason Monk [Mon, 27 Jun 2016 16:29:47 +0000 (12:29 -0400)]
Fix DND conditional null state
Persist all of the data it needs to produce the UI.
Change-Id: Ifb143b2cd3fef075cd77feaf53051eb8b7153a51
Fixes:
27664882
Bill Yi [Mon, 27 Jun 2016 14:34:32 +0000 (07:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: If45fdc9e3e694f67b9aa78b230fc1491f39f0551
Auto-generated-cl: translation import