diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-08-24 09:01:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-24 09:01:54 -0700 |
| commit | 103bff317be898498afa1a2f33b960f09592da74 (patch) | |
| tree | 39294940cac1d3ea8676d9055790b2c60be315a6 /core/java/android/content/pm | |
| parent | 7802b20586643a4138f8d92b73736ae685a36409 (diff) | |
| parent | 5474b0f8603ee66413c3e44600ca46f162f3089e (diff) | |
| download | frameworks_base-103bff317be898498afa1a2f33b960f09592da74.zip frameworks_base-103bff317be898498afa1a2f33b960f09592da74.tar.gz frameworks_base-103bff317be898498afa1a2f33b960f09592da74.tar.bz2 | |
am 5474b0f8: am 39792d22: Fix bugs with granting permissions through onNewIntent().
Merge commit '5474b0f8603ee66413c3e44600ca46f162f3089e'
* commit '5474b0f8603ee66413c3e44600ca46f162f3089e':
Fix bugs with granting permissions through onNewIntent().
Diffstat (limited to 'core/java/android/content/pm')
| -rw-r--r-- | core/java/android/content/pm/ApplicationInfo.java | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java index 7901b155..244d126 100644 --- a/core/java/android/content/pm/ApplicationInfo.java +++ b/core/java/android/content/pm/ApplicationInfo.java @@ -389,15 +389,17 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { if (permission != null) { pw.println(prefix + "permission=" + permission); } - pw.println(prefix + "uid=" + uid + " taskAffinity=" + taskAffinity); - if (theme != 0) { - pw.println(prefix + "theme=0x" + Integer.toHexString(theme)); - } - pw.println(prefix + "flags=0x" + Integer.toHexString(flags) - + " processName=" + processName); + pw.println(prefix + "processName=" + processName); + pw.println(prefix + "taskAffinity=" + taskAffinity); + pw.println(prefix + "uid=" + uid + " flags=0x" + Integer.toHexString(flags) + + " theme=0x" + Integer.toHexString(theme)); pw.println(prefix + "sourceDir=" + sourceDir); - pw.println(prefix + "publicSourceDir=" + publicSourceDir); - pw.println(prefix + "resourceDirs=" + resourceDirs); + if (!sourceDir.equals(publicSourceDir)) { + pw.println(prefix + "publicSourceDir=" + publicSourceDir); + } + if (resourceDirs != null) { + pw.println(prefix + "resourceDirs=" + resourceDirs); + } pw.println(prefix + "dataDir=" + dataDir); if (sharedLibraryFiles != null) { pw.println(prefix + "sharedLibraryFiles=" + sharedLibraryFiles); |