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

Remove demo-specific Developer Options logic

Browse Source 
Bug: 78654980
Test: make RunSettingsRoboTests

Change-Id: Ia0f3c10a6c73b3067a9f476af6e982e3ca60a46b
This commit is contained in:
Christine Franks
2018-04-23 11:19:57 -07:00
parent 1220c364c4
commit 986d02f03c
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) final boolean showDev = DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(this)
&& !Utils.isMonkeyRunning(); && !Utils.isMonkeyRunning();
final boolean isAdminOrDemo = um.isAdminUser() || um.isDemoUser();
somethingChanged = setTileEnabled(changedList, new ComponentName(packageName, somethingChanged = setTileEnabled(changedList, new ComponentName(packageName,
Settings.DevelopmentSettingsDashboardActivity.class.getName()), Settings.DevelopmentSettingsDashboardActivity.class.getName()),
showDev, isAdminOrDemo) showDev, isAdmin)
|| somethingChanged; || somethingChanged;
// Enable/disable backup settings depending on whether the user is admin. // 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 ComponentName component = category.getTile(i).intent.getComponent();
final String name = component.getClassName(); final String name = component.getClassName();
final boolean isEnabledForRestricted = ArrayUtils.contains( final boolean isEnabledForRestricted = ArrayUtils.contains(
SettingsGateway.SETTINGS_FOR_RESTRICTED, name) || (isAdminOrDemo SettingsGateway.SETTINGS_FOR_RESTRICTED, name);
&& Settings.DevelopmentSettingsDashboardActivity.class.getName()
.equals(name));
if (packageName.equals(component.getPackageName()) if (packageName.equals(component.getPackageName())
&& !isEnabledForRestricted) { && !isEnabledForRestricted) {
somethingChanged = somethingChanged =