Merge "Pin protect going into developer mode." into klp-dev (af6cdb2b) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/DeviceInfoSettings.java

+14 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ import java.io.IOException;
		import java.util.regex.Matcher;
		import java.util.regex.Pattern;

		public class DeviceInfoSettings extends SettingsPreferenceFragment {
		public class DeviceInfoSettings extends RestrictedSettingsFragment {

		private static final String LOG_TAG = "DeviceInfoSettings";

		@@ -70,12 +70,20 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment {
		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");
		@@ -178,6 +186,11 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment {
		if (UserHandle.myUserId() != UserHandle.USER_OWNER) return true;

		if (mDevHitCountdown > 0) {
		if (mDevHitCountdown == 1) {
		if (super.ensurePinRestrictedPreference(preference)) {
		return true;
		}
		}
		mDevHitCountdown--;
		if (mDevHitCountdown == 0) {
		getActivity().getSharedPreferences(DevelopmentSettings.PREF_FILE,