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
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
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
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
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
Maurice Lam
94a0fa5759
[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am: c94f2b93af
...
am: d278da7952
Change-Id: I771b15c4c94314f7fb3f1d3d3734b0c97a35f782
2016-09-06 23:11:17 +00:00
Maurice Lam
d278da7952
[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE
...
am: c94f2b93af
Change-Id: Ib66b9b9d6b97fe1299a24b0c92991b4bd6a46656
2016-09-06 23:08:45 +00:00
Maurice Lam
c94f2b93af
[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
2016-09-02 16:53:52 -07:00
Jason Monk
68d53c0481
Pre-setup restrictions DO NOT MERGE am: e6ad6e866b
...
am: 2d21d1b9cf
Change-Id: I1fc62827de765434ac88a7cb75d63febb074b565
2016-07-15 14:03:03 +00:00
Jason Monk
2d21d1b9cf
Pre-setup restrictions DO NOT MERGE
...
am: e6ad6e866b
Change-Id: I0bfc276c9bf0e3d6320cc9aa8c77f77899b69e04
2016-07-15 13:59:59 +00:00
Jason Monk
e6ad6e866b
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
2016-06-30 12:50:44 -04:00
Svetoslav
5527ac9cf2
DO NOT MERGE Modify system settings: incorrect UI state
...
am: 2c02228ad0
* commit '2c02228ad0cd7b9d86050647c679843e829819d4':
DO NOT MERGE Modify system settings: incorrect UI state
2016-02-14 22:28:25 +00:00
Svetoslav
2c02228ad0
DO NOT MERGE Modify system settings: incorrect UI state
...
The privilege for an app to write to the system settings is protected
by an app-op signature permission. App-op permissions are special: if
the app-op is deny/allow we deny/allow write access; if the app-op is
default holding the permission determies write access. The settings
code assumes that CHANGE_NETWORK_STATE is an app op permission
(system|appop) while it is a normal permission which any app gets by
declaring it used in the manifest.
The side effect is that the state of the toggle in the UI for write
system settings will initially be in the wrong state if the app uses
both WRITE_SETTINGS and CHANGE_NETWORK_STATE. However, the code in
the public API an app uses to check write settings access would return
the opposite since it checks the WRITE_SETTINGS permission and its
app op. Hence, if an app requires write settings to start the user
will see in the settings UI it has access but the app will not have
access, so the app would prompt the user to allow write settings.
The non-obvious fix is for the user to toggle the setting off and on
to get the app op in the right state and be able to launch the app.
bug:25843134
Change-Id: I3d726a66c7f9857bc7dbd5946fdbb8f340c6eb4d
(cherry picked from commit 356fb2d10d
)
(cherry picked from commit 119d589ea5
)
2016-02-12 20:25:18 +00:00
Geoff Mendal
b994c93600
Import translations. DO NOT MERGE am: 6a52aca8ea
-s ours
...
am: 21e3d54adc
-s ours
* commit '21e3d54adc473b20c2591cd348b79fe0dd43e61e':
Import translations. DO NOT MERGE
2016-01-13 01:07:32 +00:00
Geoff Mendal
21e3d54adc
Import translations. DO NOT MERGE
...
am: 6a52aca8ea
-s ours
* commit '6a52aca8eab3bb879fa7376747f23526cb8398bc':
Import translations. DO NOT MERGE
2016-01-13 01:05:38 +00:00
Geoff Mendal
6a52aca8ea
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 25447946
Change-Id: Ib40df44dd0aa81ccaec4c45aa65527c71b0b9a81
2016-01-12 16:44:04 -08:00
Geoff Mendal
75dd183bf7
Import translations. DO NOT MERGE
...
am: 2102350ea3
-s ours
* commit '2102350ea33d8bbed50d9447889876fa295b3e8a':
Import translations. DO NOT MERGE
2015-11-20 01:09:14 +00:00
Geoff Mendal
2102350ea3
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: Ic959d8e81d2c9ab397ec7f84d78900631b92346d
2015-11-20 01:02:07 +00:00
Russell Brenner
f0d538f08d
Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed
am: afe5eada5b
am: 8e4f6fbc2e
am: 5950ff1d69
...
am: 2b29501039
* commit '2b295010392c532a47e02e5b003459a50d6d5a62':
Block developer settings during SUW
2015-11-17 20:23:22 +00:00
Russell Brenner
8199c3028c
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79
am: 97759fa8d1
am: 6967df6421
-s ours am: 439033dd93
...
am: 38e932dc81
* commit '38e932dc816fe7aff6443bfa5648743f527aa097':
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
2015-11-17 20:23:06 +00:00
Russell Brenner
2b29501039
Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed
am: afe5eada5b
am: 8e4f6fbc2e
...
am: 5950ff1d69
* commit '5950ff1d69ca27c09569f40862201ede261c831e':
Block developer settings during SUW
2015-11-17 20:14:22 +00:00
Russell Brenner
38e932dc81
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79
am: 97759fa8d1
am: 6967df6421
-s ours
...
am: 439033dd93
* commit '439033dd93417b98acff392865166503a507ff30':
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
2015-11-17 20:14:10 +00:00
Russell Brenner
5950ff1d69
Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed
am: afe5eada5b
...
am: 8e4f6fbc2e
* commit '8e4f6fbc2ee74a3f7ede9d63f5a2d9c0ce153f70':
Block developer settings during SUW
2015-11-17 20:05:54 +00:00
Russell Brenner
439033dd93
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79
am: 97759fa8d1
...
am: 6967df6421
-s ours
* commit '6967df642114a9c84d993cfd544d5a32f04c26b1':
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
2015-11-17 20:05:43 +00:00
Russell Brenner
8e4f6fbc2e
Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed
...
am: afe5eada5b
* commit 'afe5eada5bbc6d961c81e881be1f12b1bfcc83e4':
Block developer settings during SUW
2015-11-17 19:57:00 +00:00
Russell Brenner
6967df6421
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79
...
am: 97759fa8d1
* commit '97759fa8d1710c0ac87cd24c69a3d1f161ac3ec3':
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
2015-11-17 19:56:48 +00:00
Russell Brenner
afe5eada5b
Merge "Block developer settings during SUW" into lmp-mr1-dev
...
am: 56d630a3ed
* commit '56d630a3eda390d8514c1e1d9f36c95e7808d1dd':
Block developer settings during SUW
2015-11-17 19:53:17 +00:00
Russell Brenner
97759fa8d1
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
...
am: 14bf226c79
* commit '14bf226c79ee16fc5dd502d81e12bf18b932f39e':
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
2015-11-17 19:51:09 +00:00