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

Settings user restriction changes: debugging features.

Browse Source 
Replacing restriction pin with a user restriction for developer options.
Bug: 14081992

Change-Id: I9a71c256fbd20428b4bd2ae12939c9a50d7b5f11
This commit is contained in:
Julia Reynolds
2014-05-08 09:29:41 -04:00
parent d65928c558
commit 6c088cb221
3 changed files with 13 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,6 +31,7 @@ import android.os.SELinux;
import android.os.SystemClock;
import android.os.SystemProperties;
import android.os.UserHandle;
import android.os.UserManager;
import android.preference.Preference;
import android.preference.PreferenceGroup;
import android.preference.PreferenceScreen;
@@ -46,7 +47,7 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class DeviceInfoSettings extends RestrictedSettingsFragment {
public class DeviceInfoSettings extends SettingsPreferenceFragment {
private static final String LOG_TAG = "DeviceInfoSettings";
private static final String FILENAME_PROC_VERSION = "/proc/version";
@@ -79,20 +80,12 @@ public class DeviceInfoSettings extends RestrictedSettingsFragment {
int mDevHitCountdown;
Toast mDevHitToast;
public DeviceInfoSettings() {
super(null /* Don't PIN protect the entire screen */);
}
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
addPreferencesFromResource(R.xml.device_info_settings);
// We only call ensurePinRestrictedPreference() when mDevHitCountdown == 0.
// This will keep us from entering developer mode without a PIN.
protectByRestrictions(KEY_BUILD_NUMBER);
setStringSummary(KEY_FIRMWARE_VERSION, Build.VERSION.RELEASE);
findPreference(KEY_FIRMWARE_VERSION).setEnabled(true);
setValueSummary(KEY_BASEBAND_VERSION, "gsm.version.baseband");
@@ -204,12 +197,10 @@ public class DeviceInfoSettings extends RestrictedSettingsFragment {
// Don't enable developer options for secondary users.
if (UserHandle.myUserId() != UserHandle.USER_OWNER) return true;
final UserManager um = (UserManager) getSystemService(Context.USER_SERVICE);
if (um.hasUserRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES)) return true;
if (mDevHitCountdown > 0) {
if (mDevHitCountdown == 1) {
if (super.ensurePinRestrictedPreference(preference)) {
return true;
}
}
mDevHitCountdown--;
if (mDevHitCountdown == 0) {
getActivity().getSharedPreferences(DevelopmentSettings.PREF_FILE,