commit 1478222cd23118099abb3a8537a9d9972d22422f
author Christine Franks <christyfranks@google.com> Mon Jan 23 16:44:02 2017 -0800
committer Christine Franks <christyfranks@google.com> Mon Feb 06 11:42:54 2017 -0800
tree b6acf17e80b20bd1e7f3eefdd23937f1564789b2
parent e0eaf67f9266e6794e4b60cde19a6ca2c78c2d01

Allow factory reset in carrier demo mode

Bug: 34341567
Test: manual - in carrier demo mode, go to Settings > Backup and
Reset > Factory data reset > Reset phone > Erase everything and
this entire path is viewable.

Change-Id: Ia5491765241adad97ecdb0a5bfd86a8371b8e4fe

src/com/android/settings/Utils.java

diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index f5bd2ce..803b8e5 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -1245,4 +1245,13 @@
         }
     }
 
+    public static boolean isCarrierDemoUser(Context context) {
+        final String carrierDemoModeSetting =
+                context.getString(com.android.internal.R.string.config_carrierDemoModeSetting);
+        return UserManager.isDeviceInDemoMode(context)
+                && getUserManager(context).isDemoUser()
+                && !TextUtils.isEmpty(carrierDemoModeSetting)
+                && (Settings.Secure.getInt(context.getContentResolver(),
+                        carrierDemoModeSetting, 0) == 1);
+    }
 }