diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-10-07 12:22:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-07 12:22:14 -0700 |
| commit | 8c4e779a4c968d4c7a4e4902484004e1659217aa (patch) | |
| tree | 07422a81d8328815f5707f67c51ee939abb2436d /core/java/android | |
| parent | 2cddeb4b82d02b540234b7b2ca0e2c0f163fc5d6 (diff) | |
| parent | e112b744c08cd7dcffe142f3cd22c96870bad482 (diff) | |
am e112b744: am 930d6c3c: Merge "Fix issue #3056500: Problem report for ASTRO" into gingerbread
Merge commit 'e112b744c08cd7dcffe142f3cd22c96870bad482'
* commit 'e112b744c08cd7dcffe142f3cd22c96870bad482':
Fix issue #3056500: Problem report for ASTRO
Diffstat (limited to 'core/java/android')
| -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 ba74d9bdd634..643e7472fcbf 100644 --- a/core/java/android/content/pm/ApplicationInfo.java +++ b/core/java/android/content/pm/ApplicationInfo.java @@ -399,7 +399,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) { |