Merge "Fix package-enabled check in Developer Settings." into nyc-dev (4d2e7789) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/DevelopmentSettings.java

+2 −13

Original line number	Diff line number	Diff line
		@@ -1930,20 +1930,9 @@ public class DevelopmentSettings extends SettingsPreferenceFragment

		private boolean isPackageEnabled(String packageName) {
		try {
		PackageManager pm = getActivity().getPackageManager();
		int enabled_state = pm.getApplicationEnabledSetting(packageName);
		switch (enabled_state) {
		case PackageManager.COMPONENT_ENABLED_STATE_ENABLED:
		return true;
		case PackageManager.COMPONENT_ENABLED_STATE_DEFAULT:
		return pm.getPackageInfo(packageName, 0).applicationInfo.enabled;
		default:
		return false;
		}
		return getActivity().getPackageManager().getApplicationInfo(packageName, 0).enabled;
		} catch (NameNotFoundException e) {
		// Thrown by PackageManager.getPackageInfo if the package does not exist
		} catch (IllegalArgumentException e) {
		// Thrown by PackageManager.getApplicationEnabledSetting if the package does not exist
		// Thrown by PackageManager.getApplicationInfo if the package does not exist
		}
		return false;
		}