diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-08-19 18:01:52 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2010-08-20 11:50:00 -0700 |
| commit | 39792d2262352ae775091876d5488d2412a2ff92 (patch) | |
| tree | fb84097c6b692079492f0ea180ab47db054656e8 /core/java/android/content/pm/ApplicationInfo.java | |
| parent | b755e3256510ecd325565d6b461d668d224445b1 (diff) | |
| download | frameworks_base-39792d2262352ae775091876d5488d2412a2ff92.zip frameworks_base-39792d2262352ae775091876d5488d2412a2ff92.tar.gz frameworks_base-39792d2262352ae775091876d5488d2412a2ff92.tar.bz2 | |
Fix bugs with granting permissions through onNewIntent().
It would grant the permission to the temporary ActivityRecord,
not the real one, so it never got cleaned up.
Also allow granting of permissions to services because... well,
it would be really really useful. And it introduces some
refactoring that we'll need to support cut/paste.
Change-Id: If521f509042e7baad7f5dc9bec84b6ba0d90ba09
Diffstat (limited to 'core/java/android/content/pm/ApplicationInfo.java')
| -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); |