Merge "Fix package-enabled check in Developer Settings." into nyc-dev am: 4d2e77899f

am: 23d28505d9

* commit '23d28505d97ac182b28f1addbb869b785db02cc8':
  Fix package-enabled check in Developer Settings.

src/com/android/settings/DevelopmentSettings.java

@@ -1930,20 +1930,9 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
 
     private boolean isPackageEnabled(String packageName) {
         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) {
-            // 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;
     }