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/MasterClearConfirm.java

diff --git a/src/com/android/settings/MasterClearConfirm.java b/src/com/android/settings/MasterClearConfirm.java
index 9c15c73..4ee17b8 100644
--- a/src/com/android/settings/MasterClearConfirm.java
+++ b/src/com/android/settings/MasterClearConfirm.java
@@ -24,6 +24,7 @@
 import android.content.Intent;
 import android.content.res.Resources;
 import android.os.Bundle;
+import android.os.UserManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -80,6 +81,10 @@
     @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_confirm, null);
         establishFinalConfirmationState();
         return mContentView;