Fixes for pin-restricted settings.

- Reprompt for pin after screen has been locked and unlocked.
- For protected preferences, store the Preference and continue if pin entry is successful.
- Protect whole UserSettings and DevelopmentSettings pages.

Bug: 10543207
Change-Id: If1d4b31ca94a8cfc103625b74385bcd0bdd3d88b

1 files changed, 1 insertions, 12 deletions

diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 912ae4c89..1542bceac 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -74,7 +74,6 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Locale;
 
 /*
  * Displays preferences for application developers.
@@ -224,7 +223,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
     private boolean mUnavailable;
 
     public DevelopmentSettings() {
-        super(null /* Don't ask for restrictions pin on creation. */);
+        super(RESTRICTIONS_PIN_SET);
     }
 
     @Override
@@ -276,13 +275,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
             disableForUser(mPassword);
         }
 
-        if (shouldBePinProtected(RESTRICTIONS_PIN_SET)) {
-            protectByRestrictions(mEnableAdb);
-            protectByRestrictions(mClearAdbKeys);
-            protectByRestrictions(mEnableTerminal);
-            protectByRestrictions(mPassword);
-        }
-
         mDebugAppPref = findPreference(DEBUG_APP_KEY);
         mAllPrefs.add(mDebugAppPref);
         mWaitForDebugger = findAndInitCheckboxPref(WAIT_FOR_DEBUGGER_KEY);
@@ -1212,9 +1204,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
 
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
-        if (super.onPreferenceTreeClick(preferenceScreen, preference)) {
-            return true;
-        }
         if (Utils.isMonkeyRunning()) {
             return false;
         }