Merge "Fix wrong dump output of *Info#flags" into oc-mr1-dev (edaa2ea5) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/ActivityInfo.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -1096,12 +1096,12 @@ public class ActivityInfo extends ComponentInfo
		}

		/** @hide */
		public void dump(Printer pw, String prefix, int flags) {
		public void dump(Printer pw, String prefix, int dumpFlags) {
		super.dumpFront(pw, prefix);
		if (permission != null) {
		pw.println(prefix + "permission=" + permission);
		}
		if ((flags&DUMP_FLAG_DETAILS) != 0) {
		if ((dumpFlags & DUMP_FLAG_DETAILS) != 0) {
		pw.println(prefix + "taskAffinity=" + taskAffinity
		+ " targetActivity=" + targetActivity
		+ " persistableMode=" + persistableModeToString());
		@@ -1120,7 +1120,7 @@ public class ActivityInfo extends ComponentInfo
		if (uiOptions != 0) {
		pw.println(prefix + " uiOptions=0x" + Integer.toHexString(uiOptions));
		}
		if ((flags&DUMP_FLAG_DETAILS) != 0) {
		if ((dumpFlags & DUMP_FLAG_DETAILS) != 0) {
		pw.println(prefix + "lockTaskLaunchMode="
		+ lockTaskLaunchModeToString(lockTaskLaunchMode));
		}
		@@ -1136,7 +1136,7 @@ public class ActivityInfo extends ComponentInfo
		if (maxAspectRatio != 0) {
		pw.println(prefix + "maxAspectRatio=" + maxAspectRatio);
		}
		super.dumpBack(pw, prefix, flags);
		super.dumpBack(pw, prefix, dumpFlags);
		}

		public String toString() {

core/java/android/content/pm/ApplicationInfo.java

+7 −7

Original line number	Diff line number	Diff line
		@@ -1046,22 +1046,22 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
		}

		/** @hide */
		public void dump(Printer pw, String prefix, int flags) {
		public void dump(Printer pw, String prefix, int dumpFlags) {
		super.dumpFront(pw, prefix);
		if ((flags&DUMP_FLAG_DETAILS) != 0 && className != null) {
		if ((dumpFlags & DUMP_FLAG_DETAILS) != 0 && className != null) {
		pw.println(prefix + "className=" + className);
		}
		if (permission != null) {
		pw.println(prefix + "permission=" + permission);
		}
		pw.println(prefix + "processName=" + processName);
		if ((flags&DUMP_FLAG_DETAILS) != 0) {
		if ((dumpFlags & DUMP_FLAG_DETAILS) != 0) {
		pw.println(prefix + "taskAffinity=" + taskAffinity);
		}
		pw.println(prefix + "uid=" + uid + " flags=0x" + Integer.toHexString(flags)
		+ " privateFlags=0x" + Integer.toHexString(privateFlags)
		+ " theme=0x" + Integer.toHexString(theme));
		if ((flags&DUMP_FLAG_DETAILS) != 0) {
		if ((dumpFlags & DUMP_FLAG_DETAILS) != 0) {
		pw.println(prefix + "requiresSmallestWidthDp=" + requiresSmallestWidthDp
		+ " compatibleWidthLimitDp=" + compatibleWidthLimitDp
		+ " largestWidthLimitDp=" + largestWidthLimitDp);
		@@ -1080,12 +1080,12 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
		if (resourceDirs != null) {
		pw.println(prefix + "resourceDirs=" + Arrays.toString(resourceDirs));
		}
		if ((flags&DUMP_FLAG_DETAILS) != 0 && seInfo != null) {
		if ((dumpFlags & DUMP_FLAG_DETAILS) != 0 && seInfo != null) {
		pw.println(prefix + "seinfo=" + seInfo);
		pw.println(prefix + "seinfoUser=" + seInfoUser);
		}
		pw.println(prefix + "dataDir=" + dataDir);
		if ((flags&DUMP_FLAG_DETAILS) != 0) {
		if ((dumpFlags & DUMP_FLAG_DETAILS) != 0) {
		pw.println(prefix + "deviceProtectedDataDir=" + deviceProtectedDataDir);
		pw.println(prefix + "credentialProtectedDataDir=" + credentialProtectedDataDir);
		if (sharedLibraryFiles != null) {
		@@ -1104,7 +1104,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
		+ " targetSdkVersion=" + targetSdkVersion
		+ " versionCode=" + versionCode
		+ " targetSandboxVersion=" + targetSandboxVersion);
		if ((flags&DUMP_FLAG_DETAILS) != 0) {
		if ((dumpFlags & DUMP_FLAG_DETAILS) != 0) {
		if (manageSpaceActivityName != null) {
		pw.println(prefix + "manageSpaceActivityName=" + manageSpaceActivityName);
		}

core/java/android/content/pm/ComponentInfo.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -184,11 +184,11 @@ public class ComponentInfo extends PackageItemInfo {
		dumpBack(pw, prefix, DUMP_FLAG_ALL);
		}

		void dumpBack(Printer pw, String prefix, int flags) {
		if ((flags&DUMP_FLAG_APPLICATION) != 0) {
		void dumpBack(Printer pw, String prefix, int dumpFlags) {
		if ((dumpFlags & DUMP_FLAG_APPLICATION) != 0) {
		if (applicationInfo != null) {
		pw.println(prefix + "ApplicationInfo:");
		applicationInfo.dump(pw, prefix + " ", flags);
		applicationInfo.dump(pw, prefix + " ", dumpFlags);
		} else {
		pw.println(prefix + "ApplicationInfo: null");
		}

core/java/android/content/pm/ProviderInfo.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -125,11 +125,11 @@ public final class ProviderInfo extends ComponentInfo
		}

		/** @hide */
		public void dump(Printer pw, String prefix, int flags) {
		public void dump(Printer pw, String prefix, int dumpFlags) {
		super.dumpFront(pw, prefix);
		pw.println(prefix + "authority=" + authority);
		pw.println(prefix + "flags=0x" + Integer.toHexString(flags));
		super.dumpBack(pw, prefix, flags);
		super.dumpBack(pw, prefix, dumpFlags);
		}

		public int describeContents() {

core/java/android/content/pm/ResolveInfo.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -282,7 +282,7 @@ public class ResolveInfo implements Parcelable {
		}

		/** @hide */
		public void dump(Printer pw, String prefix, int flags) {
		public void dump(Printer pw, String prefix, int dumpFlags) {
		if (filter != null) {
		pw.println(prefix + "Filter:");
		filter.dump(pw, prefix + " ");
		@@ -302,13 +302,13 @@ public class ResolveInfo implements Parcelable {
		}
		if (activityInfo != null) {
		pw.println(prefix + "ActivityInfo:");
		activityInfo.dump(pw, prefix + " ", flags);
		activityInfo.dump(pw, prefix + " ", dumpFlags);
		} else if (serviceInfo != null) {
		pw.println(prefix + "ServiceInfo:");
		serviceInfo.dump(pw, prefix + " ", flags);
		serviceInfo.dump(pw, prefix + " ", dumpFlags);
		} else if (providerInfo != null) {
		pw.println(prefix + "ProviderInfo:");
		providerInfo.dump(pw, prefix + " ", flags);
		providerInfo.dump(pw, prefix + " ", dumpFlags);
		}
		}