diff options
| author | Zoltan Szatmary-Ban <szatmz@google.com> | 2015-06-23 08:44:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-23 08:44:49 +0000 |
| commit | 2c3c66a2cf06b4d081f539a1fa01b44780cc65dc (patch) | |
| tree | b29af36969ddab08045a42d076ac06e2024074a6 /services/devicepolicy/java | |
| parent | 02ebcdb91101020f1897d50ed6d2e7ad048a5cec (diff) | |
| parent | 4045d24971fea4f1506ac8f16d4deeb76ac415fe (diff) | |
| download | frameworks_base-2c3c66a2cf06b4d081f539a1fa01b44780cc65dc.zip frameworks_base-2c3c66a2cf06b4d081f539a1fa01b44780cc65dc.tar.gz frameworks_base-2c3c66a2cf06b4d081f539a1fa01b44780cc65dc.tar.bz2 | |
Merge "Introduce Settings.Global.WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN" into mnc-dev
Diffstat (limited to 'services/devicepolicy/java')
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 1 |
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 416ea73..74adc6b 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 |