From 986d02f03c06d9f8d877ca109199619e3a3af6dd Mon Sep 17 00:00:00 2001
From: Christine Franks <christyfranks@google.com>
Date: Mon, 23 Apr 2018 11:19:57 -0700
Subject: [PATCH] Remove demo-specific Developer Options logic

Bug: 78654980
Test: make RunSettingsRoboTests

Change-Id: Ia0f3c10a6c73b3067a9f476af6e982e3ca60a46b
---
 src/com/android/settings/SettingsActivity.java | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 7e77047cfbc..496baa6e821 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -695,10 +695,9 @@ public class SettingsActivity extends SettingsDrawerActivity
 
         final boolean showDev = DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(this)
                 && !Utils.isMonkeyRunning();
-        final boolean isAdminOrDemo = um.isAdminUser() || um.isDemoUser();
         somethingChanged = setTileEnabled(changedList, new ComponentName(packageName,
                         Settings.DevelopmentSettingsDashboardActivity.class.getName()),
-                showDev, isAdminOrDemo)
+                showDev, isAdmin)
                 || somethingChanged;
 
         // Enable/disable backup settings depending on whether the user is admin.
@@ -735,9 +734,7 @@ public class SettingsActivity extends SettingsDrawerActivity
                         final ComponentName component = category.getTile(i).intent.getComponent();
                         final String name = component.getClassName();
                         final boolean isEnabledForRestricted = ArrayUtils.contains(
-                                SettingsGateway.SETTINGS_FOR_RESTRICTED, name) || (isAdminOrDemo
-                                && Settings.DevelopmentSettingsDashboardActivity.class.getName()
-                                .equals(name));
+                                SettingsGateway.SETTINGS_FOR_RESTRICTED, name);
                         if (packageName.equals(component.getPackageName())
                                 && !isEnabledForRestricted) {
                             somethingChanged =