summaryrefslogtreecommitdiffstats
path: root/services/devicepolicy
diff options
context:
space:
mode:
authorZoltan Szatmary-Ban <szatmz@google.com>2015-05-27 12:42:39 +0100
committerZoltan Szatmary-Ban <szatmz@google.com>2015-06-08 15:00:21 +0100
commit4045d24971fea4f1506ac8f16d4deeb76ac415fe (patch)
tree01b9a70a9a78bcbdc54eb3e5063c83a151528b4c /services/devicepolicy
parent6a5c0e10b192fe70e237c83bc752e2cbf66ffe0e (diff)
downloadframeworks_base-4045d24971fea4f1506ac8f16d4deeb76ac415fe.zip
frameworks_base-4045d24971fea4f1506ac8f16d4deeb76ac415fe.tar.gz
frameworks_base-4045d24971fea4f1506ac8f16d4deeb76ac415fe.tar.bz2
Introduce Settings.Global.WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN
This setting controls whether WiFi configurations created by a Device Owner app should be locked down (that is, editable or removable only by the Device Owner). Bug: 21427528 Change-Id: I0f8fb72bf9da1597e08d3dfc631d37b6b4178ff5
Diffstat (limited to 'services/devicepolicy')
-rw-r--r--services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index ff748f2..9f17c4b 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -246,6 +246,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
GLOBAL_SETTINGS_WHITELIST.add(Settings.Global.USB_MASS_STORAGE_ENABLED);
GLOBAL_SETTINGS_WHITELIST.add(Settings.Global.WIFI_SLEEP_POLICY);
GLOBAL_SETTINGS_WHITELIST.add(Settings.Global.STAY_ON_WHILE_PLUGGED_IN);
+ GLOBAL_SETTINGS_WHITELIST.add(Settings.Global.WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN);
}
// Keyguard features that when set of a profile will affect the profiles