Merge "Fix issue #4999574: Disabled system app not listed in Settings after reboot" (62ea5e80) · Commits · e / os / android_frameworks_base

services/java/com/android/server/pm/Settings.java

+16 −13

Original line number	Diff line number	Diff line
		@@ -1093,8 +1093,7 @@ final class Settings {
		serializer.attribute(null, "uidError", "true");
		}
		if (pkg.enabled != COMPONENT_ENABLED_STATE_DEFAULT) {
		serializer.attribute(null, "enabled",
		pkg.enabled == COMPONENT_ENABLED_STATE_ENABLED ? "true" : "false");
		serializer.attribute(null, "enabled", Integer.toString(pkg.enabled));
		}
		if (pkg.installStatus == PackageSettingBase.PKG_INSTALL_INCOMPLETE) {
		serializer.attribute(null, "installStatus", "false");
		@@ -1644,6 +1643,9 @@ final class Settings {
		packageSetting.nativeLibraryPathString = nativeLibraryPathStr;
		final String enabledStr = parser.getAttributeValue(null, "enabled");
		if (enabledStr != null) {
		try {
		packageSetting.enabled = Integer.parseInt(enabledStr);
		} catch (NumberFormatException e) {
		if (enabledStr.equalsIgnoreCase("true")) {
		packageSetting.enabled = COMPONENT_ENABLED_STATE_ENABLED;
		} else if (enabledStr.equalsIgnoreCase("false")) {
		@@ -1656,6 +1658,7 @@ final class Settings {
		+ " has bad enabled value: " + idStr + " at "
		+ parser.getPositionDescription());
		}
		}
		} else {
		packageSetting.enabled = COMPONENT_ENABLED_STATE_DEFAULT;
		}