PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix package-enabled check in Developer Settings." into nyc-dev

Browse Source 
am: 4d2e77899f

* commit '4d2e77899fe50ae7efc55228633e7c56c330f03a':
  Fix package-enabled check in Developer Settings.
This commit is contained in:
Gustav Sennton
2016-02-16 15:27:34 +00:00
committed by android-build-merger
parent c64d333316 4d2e77899f
commit 23d28505d9
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/DevelopmentSettings.java
View File

@@ -1930,20 +1930,9 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
private boolean isPackageEnabled(String packageName) { private boolean isPackageEnabled(String packageName) {
try { try {
PackageManager pm = getActivity().getPackageManager(); return getActivity().getPackageManager().getApplicationInfo(packageName, 0).enabled;
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;
}
} catch (NameNotFoundException e) { } catch (NameNotFoundException e) {
// Thrown by PackageManager.getPackageInfo if the package does not exist // Thrown by PackageManager.getApplicationInfo if the package does not exist
} catch (IllegalArgumentException e) {
// Thrown by PackageManager.getApplicationEnabledSetting if the package does not exist
} }
return false; return false;
} }