commit 46730fc78388607fd562044cbaaa26ffc9f65337
author Dianne Hackborn <hackbod@google.com> Sat Jul 24 16:32:42 2010 -0700
committer Dianne Hackborn <hackbod@google.com> Sat Jul 24 16:34:00 2010 -0700
tree 460661e109dcae2b1cae10d77cb287ac37ed6892
parent 3bee5af8162c177f8c8f4199489a401058ab26a9

Fix handling of application disabled state.

Change-Id: I617b76e89eeb75437b384b92f1205bb00b15bb70

core/java/android/content/pm/PackageParser.java

diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
index 5dc41d2..73c4011 100644
--- a/core/java/android/content/pm/PackageParser.java
+++ b/core/java/android/content/pm/PackageParser.java
@@ -2786,6 +2786,9 @@
         // For use by package manager to keep track of where it has done dexopt.
         public boolean mDidDexOpt;
         
+        // User set enabled state.
+        public int mSetEnabled = PackageManager.COMPONENT_ENABLED_STATE_DEFAULT;
+
         // Additional data supplied by callers.
         public Object mExtras;
         
@@ -3012,6 +3015,12 @@
     }
 
     private static boolean copyNeeded(int flags, Package p, Bundle metaData) {
+        if (p.mSetEnabled != PackageManager.COMPONENT_ENABLED_STATE_DEFAULT) {
+            boolean enabled = p.mSetEnabled == PackageManager.COMPONENT_ENABLED_STATE_ENABLED;
+            if (p.applicationInfo.enabled != enabled) {
+                return true;
+            }
+        }
         if ((flags & PackageManager.GET_META_DATA) != 0
                 && (metaData != null || p.mAppMetaData != null)) {
             return true;
@@ -3045,6 +3054,7 @@
         if (!sCompatibilityModeEnabled) {
             ai.disableCompatibilityMode();
         }
+        ai.enabled = p.mSetEnabled == PackageManager.COMPONENT_ENABLED_STATE_ENABLED;
         return ai;
     }
 

services/java/com/android/server/PackageManagerService.java

diff --git a/services/java/com/android/server/PackageManagerService.java b/services/java/com/android/server/PackageManagerService.java
index 11d0b7a..9d8c072 100644
--- a/services/java/com/android/server/PackageManagerService.java
+++ b/services/java/com/android/server/PackageManagerService.java
@@ -1495,6 +1495,7 @@
                 ps.pkg.applicationInfo.publicSourceDir = ps.resourcePathString;
                 ps.pkg.applicationInfo.sourceDir = ps.codePathString;
                 ps.pkg.applicationInfo.dataDir = getDataPathForPackage(ps.pkg).getPath();
+                ps.pkg.mSetEnabled = ps.enabled;
             }
             return generatePackageInfo(ps.pkg, flags);
         }
@@ -6875,6 +6876,7 @@
                     return;
                 }
                 pkgSetting.enabled = newState;
+                pkgSetting.pkg.mSetEnabled = newState;
             } else {
                 // We're dealing with a component level state change
                 switch (newState) {
@@ -8261,6 +8263,7 @@
 
         private void insertPackageSettingLP(PackageSetting p, PackageParser.Package pkg) {
             p.pkg = pkg;
+            pkg.mSetEnabled = p.enabled;
             String codePath = pkg.applicationInfo.sourceDir;
             String resourcePath = pkg.applicationInfo.publicSourceDir;
             // Update code path if needed
@@ -9486,6 +9489,9 @@
         }
 
         boolean isEnabledLP(ComponentInfo componentInfo, int flags) {
+            if ((flags&PackageManager.GET_DISABLED_COMPONENTS) != 0) {
+                return true;
+            }
             final PackageSetting packageSettings = mPackages.get(componentInfo.packageName);
             if (Config.LOGV) {
                 Log.v(TAG, "isEnabledLock - packageName = " + componentInfo.packageName
@@ -9501,14 +9507,20 @@
                     Debug.waitForDebugger();
                     Log.i(TAG, "We will crash!");
                 }
+                return false;
             }
-            return ((flags&PackageManager.GET_DISABLED_COMPONENTS) != 0)
-                   || ((componentInfo.enabled
-                        && ((packageSettings.enabled == COMPONENT_ENABLED_STATE_ENABLED)
-                            || (componentInfo.applicationInfo.enabled
-                                && packageSettings.enabled != COMPONENT_ENABLED_STATE_DISABLED))
-                        && !packageSettings.disabledComponents.contains(componentInfo.name))
-                       || packageSettings.enabledComponents.contains(componentInfo.name));
+            if (packageSettings.enabled == COMPONENT_ENABLED_STATE_DISABLED
+                    || (packageSettings.pkg != null && !packageSettings.pkg.applicationInfo.enabled
+                            && packageSettings.enabled == COMPONENT_ENABLED_STATE_DEFAULT)) {
+                return false;
+            }
+            if (packageSettings.enabledComponents.contains(componentInfo.name)) {
+                return true;
+            }
+            if (packageSettings.disabledComponents.contains(componentInfo.name)) {
+                return false;
+            }
+            return componentInfo.enabled;
         }
     }