diff options
| author | 2010-10-05 14:45:32 -0700 | |
|---|---|---|
| committer | 2010-10-05 14:45:32 -0700 | |
| commit | e112b744c08cd7dcffe142f3cd22c96870bad482 (patch) | |
| tree | dbb038d1a302cf8d05992effff5a813b53d2cc8b | |
| parent | 2c164747d364c3e51964d03ecefc5752c7c0c6ba (diff) | |
| parent | 930d6c3cd5ad387489eb1d35a38beeafe54166b6 (diff) | |
am 930d6c3c: Merge "Fix issue #3056500: Problem report for ASTRO" into gingerbread
Merge commit '930d6c3cd5ad387489eb1d35a38beeafe54166b6' into gingerbread-plus-aosp
* commit '930d6c3cd5ad387489eb1d35a38beeafe54166b6':
Fix issue #3056500: Problem report for ASTRO
| -rw-r--r-- | core/java/android/content/pm/ApplicationInfo.java | 6 |
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 b1ef0dba3a83..175d6db5375d 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) { |