diff options
| author | Russell Brenner <russellbrenner@google.com> | 2015-11-09 11:35:42 -0800 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2015-12-01 17:41:41 -0800 |
| commit | da91ef8b9a77edf99ef1c5f28071911549750c85 (patch) | |
| tree | ffd94f8f0e96d4075314d3ed7d16a9760ba842ab /src/com/android/settings/DevelopmentSettings.java | |
| parent | 46742e0cf933abfcf65be9009cd9262863280c34 (diff) | |
| download | packages_apps_Settings-da91ef8b9a77edf99ef1c5f28071911549750c85.zip packages_apps_Settings-da91ef8b9a77edf99ef1c5f28071911549750c85.tar.gz packages_apps_Settings-da91ef8b9a77edf99ef1c5f28071911549750c85.tar.bz2 | |
Block developer settings during SUW
Block access to development settings by tapping on the build number
in "About phone". Once SUW has completed, taps will be allowed.
Bug: 25290269
Change-Id: I9b2787712237f28fba446abab15a9e1c075d0419
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 461084f..8bb99c53 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; |