commit 2c53933e8d35ba50d0791a29e46fa3156e9cab7c
author Julia Reynolds <juliacr@google.com> Wed Jun 11 12:56:02 2014 -0400
committer Julia Reynolds <juliacr@google.com> Fri Jun 13 13:10:44 2014 -0400
tree 72961995d7a4cf30cb80fec223d876fb5d1d5a4c
parent 253b111a3dc95dd25421607410624a270289d2bf

Use user restriction instead of pin to guard factory reset in Settings.

Bug: 14081992
Change-Id: I60f132312368c5097b46ab97e881eec3700ef586

src/com/android/settings/MasterClear.java

diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java
index eaf29c6..bbd98fb 100644
--- a/src/com/android/settings/MasterClear.java
+++ b/src/com/android/settings/MasterClear.java
@@ -54,7 +54,6 @@
     private static final String TAG = "MasterClear";
 
     private static final int KEYGUARD_REQUEST = 55;
-    private static final int PIN_REQUEST = 56;
 
     static final String ERASE_EXTERNAL_EXTRA = "erase_sd";
 
@@ -62,7 +61,6 @@
     private Button mInitiateButton;
     private View mExternalStorageContainer;
     private CheckBox mExternalStorage;
-    private boolean mPinConfirmed;
 
     /**
      * Keyguard validation is run using the standard {@link ConfirmLockPattern}
@@ -78,25 +76,11 @@
                         res.getText(R.string.master_clear_gesture_explanation));
     }
 
-    private boolean runRestrictionsChallenge() {
-        if (UserManager.get(getActivity()).hasRestrictionsChallenge()) {
-            startActivityForResult(
-                    new Intent(Intent.ACTION_RESTRICTIONS_CHALLENGE), PIN_REQUEST);
-            return true;
-        }
-        return false;
-    }
-
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
 
-        if (requestCode == PIN_REQUEST) {
-            if (resultCode == Activity.RESULT_OK) {
-                mPinConfirmed = true;
-            }
-            return;
-        } else if (requestCode != KEYGUARD_REQUEST) {
+        if (requestCode != KEYGUARD_REQUEST) {
             return;
         }
 
@@ -125,10 +109,6 @@
     private final Button.OnClickListener mInitiateListener = new Button.OnClickListener() {
 
         public void onClick(View v) {
-            mPinConfirmed = false;
-            if (runRestrictionsChallenge()) {
-                return;
-            }
             if (!runKeyguardConfirmation(KEYGUARD_REQUEST)) {
                 showFinalConfirmation();
             }
@@ -254,22 +234,14 @@
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
+        if (UserManager.get(getActivity()).hasUserRestriction(
+                UserManager.DISALLOW_FACTORY_RESET)) {
+            return inflater.inflate(R.layout.master_clear_disallowed_screen, null);
+        }
+
         mContentView = inflater.inflate(R.layout.master_clear, null);
 
         establishInitialState();
         return mContentView;
     }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-
-        // If this is the second step after restrictions pin challenge
-        if (mPinConfirmed) {
-            mPinConfirmed = false;
-            if (!runKeyguardConfirmation(KEYGUARD_REQUEST)) {
-                showFinalConfirmation();
-            }
-        }
-    }
 }