Fix package-enabled check in Developer Settings.

The enabled-state of a package is already being accounted for when
creating an ApplicationInfo from the package manager, so checking it
again in Developer Settings to figure out whether a package is enabled
is unnecessary.

Change-Id: I1b057a28bb33fc2bbc5ea750bfa04a75860ff1d1
This commit is contained in:
Gustav Sennton
2016-02-15 14:27:38 +00:00
parent 23ce96c229
commit 80675a1df5

View File

@@ -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;
}