diff options
| author | Russell Brenner <russellbrenner@google.com> | 2015-11-17 20:05:54 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-17 20:05:54 +0000 |
| commit | 5950ff1d69ca27c09569f40862201ede261c831e (patch) | |
| tree | 2d3ee490751bc5b113887c24d36743f86b6d427f /src/com/android/settings | |
| parent | 439033dd93417b98acff392865166503a507ff30 (diff) | |
| parent | 8e4f6fbc2ee74a3f7ede9d63f5a2d9c0ce153f70 (diff) | |
| download | packages_apps_Settings-5950ff1d69ca27c09569f40862201ede261c831e.tar.gz packages_apps_Settings-5950ff1d69ca27c09569f40862201ede261c831e.tar.bz2 packages_apps_Settings-5950ff1d69ca27c09569f40862201ede261c831e.zip | |
Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed am: afe5eada5b
am: 8e4f6fbc2e
* commit '8e4f6fbc2ee74a3f7ede9d63f5a2d9c0ce153f70':
Block developer settings during SUW
Diffstat (limited to 'src/com/android/settings')
| -rw-r--r-- | src/com/android/settings/DevelopmentSettings.java | 6 | ||||
| -rw-r--r-- | src/com/android/settings/DeviceInfoSettings.java | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java index 4a4c51daa..f9950b738 100644 --- a/src/com/android/settings/DevelopmentSettings.java +++ b/src/com/android/settings/DevelopmentSettings.java @@ -285,7 +285,11 @@ public class DevelopmentSettings extends SettingsPreferenceFragment mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE); if (android.os.Process.myUserHandle().getIdentifier() != UserHandle.USER_OWNER - || mUm.hasUserRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES)) { + || mUm.hasUserRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES) + || Settings.Global.getInt(getActivity().getContentResolver(), + Settings.Global.DEVICE_PROVISIONED, 0) == 0) { + // Block access to developer options if the user is not the owner, if user policy + // restricts it, or if the device has not been provisioned mUnavailable = true; setPreferenceScreen(new PreferenceScreen(getActivity(), null)); return; diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java index 1f0cad19c..c2ab81ed5 100644 --- a/src/com/android/settings/DeviceInfoSettings.java +++ b/src/com/android/settings/DeviceInfoSettings.java @@ -224,6 +224,12 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In // Don't enable developer options for secondary users. if (UserHandle.myUserId() != UserHandle.USER_OWNER) return true; + // Don't enable developer options until device has been provisioned + if (Settings.Global.getInt(getActivity().getContentResolver(), + Settings.Global.DEVICE_PROVISIONED, 0) == 0) { + return true; + } + final UserManager um = (UserManager) getSystemService(Context.USER_SERVICE); if (um.hasUserRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES)) return true; |