commit 2d0293951a1ead39f1c642a9b8eaabcdb8538c91
author Christine Franks <christyfranks@google.com> Fri May 26 18:23:38 2017 -0700
committer Christine Franks <christyfranks@google.com> Wed May 31 12:04:01 2017 -0700
tree 137534c07a8cce9c1eadd3d7904bfcae66898518
parent 552e3c4dba0bf277f266056483125ce60e4ca97e

Allow FR in carrier demo mode

Bug: 62133292
Test: make RunSettingsRoboTests -j100, and manually verified FR is
available in carrier demo mode.

Change-Id: Ia793bf234b229da0490accfea6d44b72395a04bc

src/com/android/settings/SettingsActivity.java

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 3e45af7..4045fd2 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -842,8 +842,7 @@
 
         // Enable/disable backup settings depending on whether the user is admin.
         setTileEnabled(new ComponentName(packageName,
-                        BackupSettingsActivity.class.getName()), true,
-                isAdmin || Utils.isCarrierDemoUser(this));
+                        BackupSettingsActivity.class.getName()), true, isAdmin);
 
         setTileEnabled(new ComponentName(packageName,
                         Settings.WifiDisplaySettingsActivity.class.getName()),

src/com/android/settings/system/FactoryResetPreferenceController.java

diff --git a/src/com/android/settings/system/FactoryResetPreferenceController.java b/src/com/android/settings/system/FactoryResetPreferenceController.java
index 38afd16..a3cf10a 100644
--- a/src/com/android/settings/system/FactoryResetPreferenceController.java
+++ b/src/com/android/settings/system/FactoryResetPreferenceController.java
@@ -24,6 +24,7 @@
 import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
+import com.android.settings.Utils;
 import com.android.settings.core.PreferenceController;
 
 import java.util.List;
@@ -41,10 +42,10 @@
         mAm = (AccountManager) context.getSystemService(Context.ACCOUNT_SERVICE);
     }
 
-    /** Hide "Factory reset" settings for secondary users. */
+    /** Hide "Factory reset" settings for secondary users, except demo users. */
     @Override
     public boolean isAvailable() {
-        return mUm.isAdminUser();
+        return mUm.isAdminUser() || Utils.isCarrierDemoUser(mContext);
     }
 
     @Override