diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index af38ad0..f33b23d 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -1930,20 +1930,9 @@
 
     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;
     }
