diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-01-05 11:43:48 -0800 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-01-05 11:43:48 -0800 |
| commit | 5381b5a2b61fea30b6d5249643412b4b87ca13ca (patch) | |
| tree | 77ba3a28be12aaed5d20a8bc683559cf26ca1b2f /src/com/android/settings/DevelopmentSettings.java | |
| parent | 32f2f125160a57f4511c56069398c024b7f91579 (diff) | |
| parent | f4b8ad6c3105fa17fba85e852b710e48aaf0794d (diff) | |
| download | packages_apps_Settings-5381b5a2b61fea30b6d5249643412b4b87ca13ca.zip packages_apps_Settings-5381b5a2b61fea30b6d5249643412b4b87ca13ca.tar.gz packages_apps_Settings-5381b5a2b61fea30b6d5249643412b4b87ca13ca.tar.bz2 | |
Merge tag 'android-6.0.1_r10' into HEAD
Ticket: CYNGNOS-1404
Android 6.0.1 release 10
Change-Id: I40f4f8e3e1c508807323ec222eeb4baeb329fd5e
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 b6c57b3..2f753ef 100644 --- a/src/com/android/settings/DevelopmentSettings.java +++ b/src/com/android/settings/DevelopmentSettings.java @@ -325,7 +325,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; |