Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d5c3b96 authored Oct 22, 2019 by Hui Yu

Do not print Intent ClipData in logcat/dumpsys output.

Change-Id: I7472248777bcff01a8db3be707c19dfab098213a
Fix: 142834800
Test: the reproduce steps in b/142834800

parent 5a234006

core/java/android/content/ClipData.java

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1069,9 +1069,8 @@ public class ClipData implements Parcelable {
	if (!first) {		if (!first) {
	b.append(' ');		b.append(' ');
	}		}
	mItems.get(0).toShortString(b);		for (int i=0; i<mItems.size(); i++) {
	if (mItems.size() > 1) {		b.append("{...}");
	b.append(" ...");
	}		}
	}		}
	}		}

services/core/java/com/android/server/am/PendingIntentRecord.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -508,7 +508,7 @@ public final class PendingIntentRecord extends IIntentSender.Stub {
	}		}
	if (key.requestIntent != null) {		if (key.requestIntent != null) {
	pw.print(prefix); pw.print("requestIntent=");		pw.print(prefix); pw.print("requestIntent=");
	pw.println(key.requestIntent.toShortString(false, true, true, true));		pw.println(key.requestIntent.toShortString(false, true, true, false));
	}		}
	if (sent \|\| canceled) {		if (sent \|\| canceled) {
	pw.print(prefix); pw.print("sent="); pw.print(sent);		pw.print(prefix); pw.print("sent="); pw.print(sent);

services/core/java/com/android/server/am/ServiceRecord.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -256,7 +256,7 @@ final class ServiceRecord extends Binder implements ComponentName.WithComponentN
	}		}
	if (intent != null) {		if (intent != null) {
	intent.getIntent().writeToProto(proto, ServiceRecordProto.INTENT, false, true, false,		intent.getIntent().writeToProto(proto, ServiceRecordProto.INTENT, false, true, false,
	true);		false);
	}		}
	proto.write(ServiceRecordProto.PACKAGE_NAME, packageName);		proto.write(ServiceRecordProto.PACKAGE_NAME, packageName);
	proto.write(ServiceRecordProto.PROCESS_NAME, processName);		proto.write(ServiceRecordProto.PROCESS_NAME, processName);
	@@ -358,7 +358,7 @@ final class ServiceRecord extends Binder implements ComponentName.WithComponentN

	void dump(PrintWriter pw, String prefix) {		void dump(PrintWriter pw, String prefix) {
	pw.print(prefix); pw.print("intent={");		pw.print(prefix); pw.print("intent={");
	pw.print(intent.getIntent().toShortString(false, true, false, true));		pw.print(intent.getIntent().toShortString(false, true, false, false));
	pw.println('}');		pw.println('}');
	pw.print(prefix); pw.print("packageName="); pw.println(packageName);		pw.print(prefix); pw.print("packageName="); pw.println(packageName);
	pw.print(prefix); pw.print("processName="); pw.println(processName);		pw.print(prefix); pw.print("processName="); pw.println(processName);

services/core/java/com/android/server/wm/ActivityRecord.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -751,7 +751,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
	pw.print(" launchedFromPackage="); pw.print(launchedFromPackage);		pw.print(" launchedFromPackage="); pw.print(launchedFromPackage);
	pw.print(" userId="); pw.println(mUserId);		pw.print(" userId="); pw.println(mUserId);
	pw.print(prefix); pw.print("app="); pw.println(app);		pw.print(prefix); pw.print("app="); pw.println(app);
	pw.print(prefix); pw.println(intent.toInsecureStringWithClip());		pw.print(prefix); pw.println(intent.toInsecureString());
	pw.print(prefix); pw.print("rootOfTask="); pw.print(isRootOfTask());		pw.print(prefix); pw.print("rootOfTask="); pw.print(isRootOfTask());
	pw.print(" task="); pw.println(task);		pw.print(" task="); pw.println(task);
	pw.print(prefix); pw.print("taskAffinity="); pw.println(taskAffinity);		pw.print(prefix); pw.print("taskAffinity="); pw.println(taskAffinity);
	@@ -846,7 +846,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
	if (intent == null) {		if (intent == null) {
	pw.println("null");		pw.println("null");
	} else {		} else {
	pw.println(intent.toShortString(false, true, false, true));		pw.println(intent.toShortString(false, true, false, false));
	}		}
	}		}
	}		}

services/core/java/com/android/server/wm/ActivityStackSupervisor.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2247,7 +2247,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks {
	// Complete + brief == give a summary. Isn't that obvious?!?		// Complete + brief == give a summary. Isn't that obvious?!?
	if (lastTask.intent != null) {		if (lastTask.intent != null) {
	pw.print(prefix); pw.print(" ");		pw.print(prefix); pw.print(" ");
	pw.println(lastTask.intent.toInsecureStringWithClip());		pw.println(lastTask.intent.toInsecureString());
	}		}
	}		}
	}		}