PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove demo-specific Developer Options logic"

Browse Source
This commit is contained in:
android-build-team Robot
2018-05-08 21:52:51 +00:00
committed by Android (Google) Code Review
parent 714b15cbdf 986d02f03c
commit 6e0e48cc25
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/SettingsActivity.java
View File

@@ -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 =