Merge "Move restriction check for dev settings into controller"

2018-02-08 21:51:50 +00:00
parent ce21e7a978 155d6829e9
commit 39a5eb5f20
5 changed files with 46 additions and 8 deletions
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -808,7 +808,6 @@ public class SettingsActivity extends SettingsDrawerActivity
                || somethingChanged;

        final boolean showDev = DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(this)
-                && !um.hasUserRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES)
                && !Utils.isMonkeyRunning();

        somethingChanged = setTileEnabled(new ComponentName(packageName,