diff options
| author | Russell Brenner <russellbrenner@google.com> | 2015-11-17 20:14:22 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-17 20:14:22 +0000 |
| commit | 2b295010392c532a47e02e5b003459a50d6d5a62 (patch) | |
| tree | 30065bcab4b729b5857c795fddff1e977339b7b2 /src/com/android/settings/DevelopmentSettings.java | |
| parent | 38e932dc816fe7aff6443bfa5648743f527aa097 (diff) | |
| parent | 5950ff1d69ca27c09569f40862201ede261c831e (diff) | |
| download | packages_apps_Settings-2b295010392c532a47e02e5b003459a50d6d5a62.tar.gz packages_apps_Settings-2b295010392c532a47e02e5b003459a50d6d5a62.tar.bz2 packages_apps_Settings-2b295010392c532a47e02e5b003459a50d6d5a62.zip | |
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
Diffstat (limited to 'src/com/android/settings/DevelopmentSettings.java')
| -rw-r--r-- | src/com/android/settings/DevelopmentSettings.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java index 461084f8e..8bb99c538 100644 --- a/src/com/android/settings/DevelopmentSettings.java +++ b/src/com/android/settings/DevelopmentSettings.java @@ -288,7 +288,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; |