Merge "Fix Developer options appears after first boot, disappers on Settings Menu Reload" into nyc-dev am: 81c03dc am: 38ee923

am: 83ff72c

* commit '83ff72cd44cd5b8638e002e784f7c5b96b379e2b':
  Fix Developer options appears after first boot, disappers on Settings Menu Reload

Change-Id: Ibe735f3be61cc1b6ceb8a30e9060dc3d8dc9eefc
This commit is contained in:
Clara Bayarri
2016-04-20 13:37:23 +00:00
committed by android-build-merger
2 changed files with 3 additions and 3 deletions

View File

@@ -1095,8 +1095,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