PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed am: afe5eada5b

Browse Source 
am: 8e4f6fbc2e

* commit '8e4f6fbc2ee74a3f7ede9d63f5a2d9c0ce153f70':
  Block developer settings during SUW
This commit is contained in:
Russell Brenner
2015-11-17 20:05:54 +00:00
committed by android-build-merger
parent 439033dd93 8e4f6fbc2e
commit 5950ff1d69
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/DevelopmentSettings.java
View File

@@ -285,7 +285,11 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE); mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
if (android.os.Process.myUserHandle().getIdentifier() != UserHandle.USER_OWNER 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; mUnavailable = true;
setPreferenceScreen(new PreferenceScreen(getActivity(), null)); setPreferenceScreen(new PreferenceScreen(getActivity(), null));
return; return;

6
src/com/android/settings/DeviceInfoSettings.java
View File

@@ -224,6 +224,12 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In
// Don't enable developer options for secondary users. // Don't enable developer options for secondary users.
if (UserHandle.myUserId() != UserHandle.USER_OWNER) return true; 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); final UserManager um = (UserManager) getSystemService(Context.USER_SERVICE);
if (um.hasUserRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES)) return true; if (um.hasUserRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES)) return true;