Fix issue #3333958: Package Manager can sometimes mistakenly think...

Dianne Hackborn · Dianne Hackborn · commit 433863b10852 · 2011-01-09T11:46:27.000-08:00
...an app is disabled!

Ouch.

Change-Id: I5788c5f8edfe2a0d6f4f0f3359e1742f8ed8d98e
diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
@@ -3049,7 +3049,11 @@ public static ApplicationInfo generateApplicationInfo(Package p, int flags) {
         if (!sCompatibilityModeEnabled) {
             ai.disableCompatibilityMode();
         }
-        ai.enabled = p.mSetEnabled == PackageManager.COMPONENT_ENABLED_STATE_ENABLED;
+        if (p.mSetEnabled == PackageManager.COMPONENT_ENABLED_STATE_ENABLED) {
+            ai.enabled = true;
+        } else if (p.mSetEnabled == PackageManager.COMPONENT_ENABLED_STATE_DISABLED) {
+            ai.enabled = false;
+        }
         return ai;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -3049,7 +3049,11 @@ public static ApplicationInfo generateApplicationInfo(Package p, int flags) {`
`3049`	`3049`	`if (!sCompatibilityModeEnabled) {`
`3050`	`3050`	`ai.disableCompatibilityMode();`
`3051`	`3051`	`}`
`3052`		`- ai.enabled = p.mSetEnabled == PackageManager.COMPONENT_ENABLED_STATE_ENABLED;`
	`3052`	`+ if (p.mSetEnabled == PackageManager.COMPONENT_ENABLED_STATE_ENABLED) {`
	`3053`	`+ ai.enabled = true;`
	`3054`	`+ } else if (p.mSetEnabled == PackageManager.COMPONENT_ENABLED_STATE_DISABLED) {`
	`3055`	`+ ai.enabled = false;`
	`3056`	`+ }`
`3053`	`3057`	`return ai;`
`3054`	`3058`	`}`
`3055`	`3059`