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, 2 insertions, 7 deletions

diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 1c2c5f72a..bbae37d03 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -135,7 +135,7 @@ public class UserSettings extends RestrictedSettingsFragment
     private boolean mIsOwner = UserHandle.myUserId() == UserHandle.USER_OWNER;
 
     public UserSettings() {
-        super(null);
+        super(RestrictedSettingsFragment.RESTRICTIONS_PIN_SET);
     }
 
     private Handler mHandler = new Handler() {
@@ -718,9 +718,6 @@ public class UserSettings extends RestrictedSettingsFragment
 
     @Override
     public boolean onPreferenceClick(Preference pref) {
-        if (pref == mAddUser && !restrictionsPinCheck(RESTRICTIONS_PIN_SET)) {
-            return false;
-        }
         if (pref == mMePreference) {
             Intent editProfile;
             if (!mProfileExists) {
@@ -780,9 +777,7 @@ public class UserSettings extends RestrictedSettingsFragment
             int userId = ((UserPreference) v.getTag()).getUserId();
             switch (v.getId()) {
             case UserPreference.DELETE_ID:
-                if (restrictionsPinCheck(RESTRICTIONS_PIN_SET)) {
-                    onRemoveUserClicked(userId);
-                }
+                onRemoveUserClicked(userId);
                 break;
             case UserPreference.SETTINGS_ID:
                 onManageUserClicked(userId, false);