Merge "Fix Developer options appears after first boot, disappers on Settings Menu Reload" into nyc-dev

This commit is contained in:
Clara Bayarri
2016-04-20 13:24:43 +00:00
committed by Android (Google) Code Review
2 changed files with 3 additions and 3 deletions

View File

@@ -1096,8 +1096,7 @@ public class SettingsActivity extends SettingsDrawerActivity
enabled = false;
}
int state = pm.getComponentEnabledSetting(component);
boolean isEnabled = state == PackageManager.COMPONENT_ENABLED_STATE_DEFAULT
|| state == PackageManager.COMPONENT_ENABLED_STATE_ENABLED;
boolean isEnabled = state == PackageManager.COMPONENT_ENABLED_STATE_ENABLED;
if (isEnabled != enabled) {
pm.setComponentEnabledSetting(component, enabled
? PackageManager.COMPONENT_ENABLED_STATE_ENABLED