Svetoslav
28daa67fcb
[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: I2da4eec1c3574bd6aef9ab968c9deb148536cb0a
2015-12-03 14:36:36 -08:00
Hyejin Kim
623852f6c7
Add IMS settings to Network setting reset
...
Add the factory reset function to be used to reset IMS settings
BUG=25300757
Change-Id: I78d2e919418b7a0b42f56af3442d7d98afe40d77
2015-12-01 10:59:25 -08:00
Geoff Mendal
058c71f15d
Import translations. DO NOT MERGE am: 2102350ea3
-s ours am: 75dd183bf7
-s ours am: 74e9c3d348
-s ours am: 39be1461a8
-s ours
...
am: bdbd6da522
-s ours
* commit 'bdbd6da522691b4cd7517e12e725676f2ee08983':
Import translations. DO NOT MERGE
2015-11-20 04:44:18 +00:00
Geoff Mendal
bdbd6da522
Import translations. DO NOT MERGE am: 2102350ea3
-s ours am: 75dd183bf7
-s ours am: 74e9c3d348
-s ours
...
am: 39be1461a8
-s ours
* commit '39be1461a876a4442e11dc26cff14ec80273baf0':
Import translations. DO NOT MERGE
2015-11-20 01:24:46 +00:00
Geoff Mendal
39be1461a8
Import translations. DO NOT MERGE am: 2102350ea3
-s ours am: 75dd183bf7
-s ours
...
am: 74e9c3d348
-s ours
* commit '74e9c3d34840c6a33afd7cef4b8fb0e1b73c9a93':
Import translations. DO NOT MERGE
2015-11-20 01:19:50 +00:00
Geoff Mendal
74e9c3d348
Import translations. DO NOT MERGE am: 2102350ea3
-s ours
...
am: 75dd183bf7
-s ours
* commit '75dd183bf7b99c995fe773e7b53a6604a6b53512':
Import translations. DO NOT MERGE
2015-11-20 01:14:23 +00: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
549379737d
Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed
am: afe5eada5b
am: 8e4f6fbc2e
am: 5950ff1d69
am: 2b29501039
am: f0d538f08d
...
am: ebc5086d15
* commit 'ebc5086d15bc1be602dfcd31925000e8c6184f16':
Block developer settings during SUW
2015-11-17 20:40:50 +00:00
Russell Brenner
4868199d28
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79
am: 97759fa8d1
am: 6967df6421
-s ours am: 439033dd93
am: 38e932dc81
am: 8199c3028c
...
am: bcf3b75f57
* commit 'bcf3b75f5732cc270d1974edd2cf1ed48863cb31':
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
2015-11-17 20:40:38 +00:00
Russell Brenner
ebc5086d15
Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed
am: afe5eada5b
am: 8e4f6fbc2e
am: 5950ff1d69
am: 2b29501039
...
am: f0d538f08d
* commit 'f0d538f08da7c45e545e51e93373afe38cbd518f':
Block developer settings during SUW
2015-11-17 20:32:03 +00:00
Russell Brenner
bcf3b75f57
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79
am: 97759fa8d1
am: 6967df6421
-s ours am: 439033dd93
am: 38e932dc81
...
am: 8199c3028c
* commit '8199c3028c05cd9c85b6f26fe656518f536bda69':
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
2015-11-17 20:31:54 +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
Russell Brenner
7285e2c2fc
Merge "Preserve FRP lock if wiped during SUW" into mnc-dev am: f0ff1631de
am: 2075d98be6
am: 7d44fe6fdb
...
am: 6a7ff3186b
* commit '6a7ff3186b6ad03a08801b8bb3fff5a30185eb4d':
Preserve FRP lock if wiped during SUW
2015-11-17 01:47:46 +00:00
Russell Brenner
6a7ff3186b
Merge "Preserve FRP lock if wiped during SUW" into mnc-dev am: f0ff1631de
am: 2075d98be6
...
am: 7d44fe6fdb
* commit '7d44fe6fdb95dce08e4c8cd1a1c1a1c8f3ea4a63':
Preserve FRP lock if wiped during SUW
2015-11-17 01:37:51 +00:00
Russell Brenner
7d44fe6fdb
Merge "Preserve FRP lock if wiped during SUW" into mnc-dev am: f0ff1631de
...
am: 2075d98be6
* commit '2075d98be6199032d0bdf65d9e1789153e12fb66':
Preserve FRP lock if wiped during SUW
2015-11-17 01:29:12 +00:00
Sanket Padawe
5df69b5307
Uncheck checkbox for contact sharing by default for non carkit devices. am: 98f11fd1a4
am: 28eca8e8c2
am: 773b8a3c44
...
am: 60461f3410
* commit '60461f3410151716d34d87ae1ca4ad00620b72eb':
Uncheck checkbox for contact sharing by default for non carkit devices.
2015-11-17 01:28:09 +00:00
Russell Brenner
2075d98be6
Merge "Preserve FRP lock if wiped during SUW" into mnc-dev
...
am: f0ff1631de
* commit 'f0ff1631dee1d988151f8260e6c65ff836a40e80':
Preserve FRP lock if wiped during SUW
2015-11-17 01:22:41 +00:00
Sanket Padawe
60461f3410
Uncheck checkbox for contact sharing by default for non carkit devices. am: 98f11fd1a4
am: 28eca8e8c2
...
am: 773b8a3c44
* commit '773b8a3c4422ab9daf7adb62895568852b43882e':
Uncheck checkbox for contact sharing by default for non carkit devices.
2015-11-17 01:22:25 +00:00
Sanket Padawe
773b8a3c44
Uncheck checkbox for contact sharing by default for non carkit devices. am: 98f11fd1a4
...
am: 28eca8e8c2
* commit '28eca8e8c2d9e11a9f304e85ff3a34819edd68a9':
Uncheck checkbox for contact sharing by default for non carkit devices.
2015-11-17 01:16:41 +00:00
Russell Brenner
f0ff1631de
Merge "Preserve FRP lock if wiped during SUW" into mnc-dev
2015-11-17 01:14:11 +00:00
Russell Brenner
56d630a3ed
Merge "Block developer settings during SUW" into lmp-mr1-dev
2015-11-17 01:13:55 +00:00
Sanket Padawe
28eca8e8c2
Uncheck checkbox for contact sharing by default for non carkit devices.
...
am: 98f11fd1a4
* commit '98f11fd1a4752beed56b5fe7a4097ec0ae0c74b3':
Uncheck checkbox for contact sharing by default for non carkit devices.
2015-11-17 01:12:09 +00:00
Russell Brenner
14bf226c79
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
...
Guard against FRP attacks by keeping the persistent data block
intact, if a factory reset has been issued during SUW.
Bug: 25290269
Change-Id: Id26b4c10235ad126632b71875592a4fa70a39b24
2015-11-13 18:10:44 +00:00
Russell Brenner
de4fc8eb2a
Preserve FRP lock if wiped during SUW
...
Guard against FRP attacks by keeping the persistent data block
intact, if a factory reset has been issued during SUW.
[resolves merge conflicts with ag/808069]
Bug: 25290269
Change-Id: Id26b4c10235ad126632b71875592a4fa70a39b24
2015-11-13 18:08:51 +00:00
Robin Lee
3ed65b90d0
Merge "VPN settings: grey out policy-restricted menus" am: ee4808d37b
...
am: 905829393d
* commit '905829393d85db3e5d3f4b18a37c5da7184e6a63':
VPN settings: grey out policy-restricted menus
2015-11-13 14:11:32 +00:00
Robin Lee
905829393d
Merge "VPN settings: grey out policy-restricted menus"
...
am: ee4808d37b
* commit 'ee4808d37b955299501e9b753cc7bb19877d4f83':
VPN settings: grey out policy-restricted menus
2015-11-13 14:08:52 +00:00
Robin Lee
ee4808d37b
Merge "VPN settings: grey out policy-restricted menus"
2015-11-13 14:07:05 +00:00
Robin Lee
4198607ee2
VPN settings: grey out policy-restricted menus
...
setHasOptionsMenu seems unreliable at stopping onCreateOptoinsMenu from
being called.
Change-Id: Ie86da8e35dddb6e3a0e4678defc55bf5776f6c2f
2015-11-13 14:01:43 +00:00
Sanket Padawe
f20ba4b797
Uncheck checkbox for contact sharing by default for non carkit devices. am: dbc47fb262
am: 0ad16831ee
...
am: df5b8c5b65
* commit 'df5b8c5b65050f08c36c1610d856282ab05fae5f':
Uncheck checkbox for contact sharing by default for non carkit devices.
2015-11-13 00:07:06 +00:00
Sanket Padawe
df5b8c5b65
Uncheck checkbox for contact sharing by default for non carkit devices. am: dbc47fb262
...
am: 0ad16831ee
* commit '0ad16831ee2e2029a0fc2891c8007505bb9779cd':
Uncheck checkbox for contact sharing by default for non carkit devices.
2015-11-13 00:02:30 +00:00
Sanket Padawe
0ad16831ee
Uncheck checkbox for contact sharing by default for non carkit devices.
...
am: dbc47fb262
* commit 'dbc47fb262a4273417d99dabab757854aa3b0eaf':
Uncheck checkbox for contact sharing by default for non carkit devices.
2015-11-12 23:57:48 +00:00
Sanket Padawe
98f11fd1a4
Uncheck checkbox for contact sharing by default for non carkit devices.
...
+ In BT pairing dialog, uncheck checkbox for contact sharing by default
for devices not recognized as carkits at pair time.
Bug: 23607427
Change-Id: I7f1d40d86e713e248d3c225459be4895c4f75d76
(cherry picked from commit dbc47fb262
)
2015-11-12 23:54:06 +00:00
Sanket Padawe
dbc47fb262
Uncheck checkbox for contact sharing by default for non carkit devices.
...
+ In BT pairing dialog, uncheck checkbox for contact sharing by default
for devices not recognized as carkits at pair time.
Bug: 23607427
Change-Id: I7f1d40d86e713e248d3c225459be4895c4f75d76
2015-11-12 14:55:51 -08:00
Russell Brenner
4836ab6df4
Block developer settings during SUW
...
Block access to development settings by tapping on the build number
in "About phone". Once SUW has completed, taps will be allowed.
Bug: 25290269
Change-Id: I9b2787712237f28fba446abab15a9e1c075d0419
2015-11-10 12:15:48 -08:00
Jason Monk
7ee05202ab
Null check queryIntentServices am: a4c9492b50
am: e27cada8c4
...
am: e198f7b84f
* commit 'e198f7b84fde2b3ca3f0e0c9195166b06363850e':
Null check queryIntentServices
2015-11-09 22:40:33 +00:00
Jason Monk
e198f7b84f
Null check queryIntentServices am: a4c9492b50
...
am: e27cada8c4
* commit 'e27cada8c49c8aec2463c352faf5211502b1b372':
Null check queryIntentServices
2015-11-09 22:36:21 +00:00
Jason Monk
e27cada8c4
Null check queryIntentServices
...
am: a4c9492b50
* commit 'a4c9492b50b742488a6a92abdc290b5ada3c004b':
Null check queryIntentServices
2015-11-09 22:31:51 +00:00
Jason Monk
a4c9492b50
Null check queryIntentServices
...
Bug: 25575738
Change-Id: I006a0e2f47863ac0f5d8ae28c88614481d13e8d3
2015-11-09 16:56:46 -05:00
Baligh Uddin
4b87b724eb
Import translations. DO NOT MERGE
...
am: 7b9f79bb6e
-s ours
* commit '7b9f79bb6e6c72adae3e9674617b5b9c45c769bd':
Import translations. DO NOT MERGE
2015-11-05 19:40:21 +00:00
Baligh Uddin
7b9f79bb6e
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 25433205
Change-Id: I38ff46207ad622dc25f4cbbf6445ceac1dcfedb7
2015-11-04 12:11:39 -08:00