summaryrefslogtreecommitdiffstats
path: root/core/java/android/content
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-01-07 18:42:59 -0800
committerDianne Hackborn <hackbod@google.com>2011-01-09 13:15:30 -0800
commit1f22d2a31abc5fa8a2d97f1f506bb2c25c87a96b (patch)
tree31a5740b1051591553f15249c73662d58df97aa2 /core/java/android/content
parent6d175c727e0e671eb9a710b9d1fc8e9d646944e3 (diff)
downloadframeworks_base-1f22d2a31abc5fa8a2d97f1f506bb2c25c87a96b.zip
frameworks_base-1f22d2a31abc5fa8a2d97f1f506bb2c25c87a96b.tar.gz
frameworks_base-1f22d2a31abc5fa8a2d97f1f506bb2c25c87a96b.tar.bz2
DO NOT MERGE Fix issue #3333958: Package Manager can sometimes mistakenly think...
...an app is disabled! Ouch. Change-Id: I45dc2beef4e413fd447d905632901fadd924cb6e
Diffstat (limited to 'core/java/android/content')
-rw-r--r--core/java/android/content/pm/PackageParser.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
index ad74707..c8ca080 100644
--- a/core/java/android/content/pm/PackageParser.java
+++ b/core/java/android/content/pm/PackageParser.java
@@ -3086,7 +3086,11 @@ public class PackageParser {
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;
}