summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-10-05 14:42:04 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-10-05 14:42:04 -0700
commit930d6c3cd5ad387489eb1d35a38beeafe54166b6 (patch)
tree5d6b97615387f8b34e23be3555151f9f8fc91b65
parentf7872780ca3dae9584251b1e3495aed12110254c (diff)
parent817c24752cf1d70bcd53a038a0d06abbb1ec6aad (diff)
downloadframeworks_base-930d6c3cd5ad387489eb1d35a38beeafe54166b6.zip
frameworks_base-930d6c3cd5ad387489eb1d35a38beeafe54166b6.tar.gz
frameworks_base-930d6c3cd5ad387489eb1d35a38beeafe54166b6.tar.bz2
Merge "Fix issue #3056500: Problem report for ASTRO" into gingerbread
-rw-r--r--core/java/android/content/pm/ApplicationInfo.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java
index b1ef0db..175d6db 100644
--- a/core/java/android/content/pm/ApplicationInfo.java
+++ b/core/java/android/content/pm/ApplicationInfo.java
@@ -400,7 +400,11 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
pw.println(prefix + "uid=" + uid + " flags=0x" + Integer.toHexString(flags)
+ " theme=0x" + Integer.toHexString(theme));
pw.println(prefix + "sourceDir=" + sourceDir);
- if (!sourceDir.equals(publicSourceDir)) {
+ if (sourceDir == null) {
+ if (publicSourceDir != null) {
+ pw.println(prefix + "publicSourceDir=" + publicSourceDir);
+ }
+ } else if (!sourceDir.equals(publicSourceDir)) {
pw.println(prefix + "publicSourceDir=" + publicSourceDir);
}
if (resourceDirs != null) {