summaryrefslogtreecommitdiffstats
path: root/core/java/android/content/pm/ApplicationInfo.java
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2009-11-11 19:23:32 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-11-11 19:23:32 -0800
commit78bceeb925dff57543d7d9cd27f560448fb2e854 (patch)
treec91a588eba6c901805b5d7e7e52e88221fb5693f /core/java/android/content/pm/ApplicationInfo.java
parentf53ac7c87e3c66883be0a33a6b6b431714925969 (diff)
parent8c3fc0801bb32a99dd5ab97c93bb615999b2c977 (diff)
downloadframeworks_base-78bceeb925dff57543d7d9cd27f560448fb2e854.zip
frameworks_base-78bceeb925dff57543d7d9cd27f560448fb2e854.tar.gz
frameworks_base-78bceeb925dff57543d7d9cd27f560448fb2e854.tar.bz2
am 8c3fc080: am 5bb200fd: am 2ade6421: Merge change I775e1ec0 into eclair
Merge commit '8c3fc0801bb32a99dd5ab97c93bb615999b2c977' * commit '8c3fc0801bb32a99dd5ab97c93bb615999b2c977': Debugging for issue #2250075: Desk dock clock app sometimes doesn't
Diffstat (limited to 'core/java/android/content/pm/ApplicationInfo.java')
-rw-r--r--core/java/android/content/pm/ApplicationInfo.java30
1 files changed, 20 insertions, 10 deletions
diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java
index fca2453..3dea286 100644
--- a/core/java/android/content/pm/ApplicationInfo.java
+++ b/core/java/android/content/pm/ApplicationInfo.java
@@ -280,21 +280,31 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
public void dump(Printer pw, String prefix) {
super.dumpFront(pw, prefix);
- pw.println(prefix + "className=" + className);
- pw.println(prefix + "permission=" + permission
- + " uid=" + uid);
- pw.println(prefix + "taskAffinity=" + taskAffinity);
- pw.println(prefix + "theme=0x" + Integer.toHexString(theme));
+ if (className != null) {
+ pw.println(prefix + "className=" + className);
+ }
+ 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 + "sourceDir=" + sourceDir);
pw.println(prefix + "publicSourceDir=" + publicSourceDir);
- pw.println(prefix + "sharedLibraryFiles=" + sharedLibraryFiles);
pw.println(prefix + "dataDir=" + dataDir);
- pw.println(prefix + "targetSdkVersion=" + targetSdkVersion);
- pw.println(prefix + "enabled=" + enabled);
- pw.println(prefix + "manageSpaceActivityName="+manageSpaceActivityName);
- pw.println(prefix + "description=0x"+Integer.toHexString(descriptionRes));
+ if (sharedLibraryFiles != null) {
+ pw.println(prefix + "sharedLibraryFiles=" + sharedLibraryFiles);
+ }
+ pw.println(prefix + "enabled=" + enabled + " targetSdkVersion=" + targetSdkVersion);
+ if (manageSpaceActivityName != null) {
+ pw.println(prefix + "manageSpaceActivityName="+manageSpaceActivityName);
+ }
+ if (descriptionRes != 0) {
+ pw.println(prefix + "description=0x"+Integer.toHexString(descriptionRes));
+ }
super.dumpBack(pw, prefix);
}