diff --git a/core/java/android/content/ClipData.java b/core/java/android/content/ClipData.java
index fdef2a143fc4b..b6a0a564538f3 100644
--- a/core/java/android/content/ClipData.java
+++ b/core/java/android/content/ClipData.java
@@ -1069,9 +1069,8 @@ public class ClipData implements Parcelable {
             if (!first) {
                 b.append(' ');
             }
-            mItems.get(0).toShortString(b);
-            if (mItems.size() > 1) {
-                b.append(" ...");
+            for (int i=0; i<mItems.size(); i++) {
+                b.append("{...}");
             }
         }
     }
diff --git a/services/core/java/com/android/server/am/PendingIntentRecord.java b/services/core/java/com/android/server/am/PendingIntentRecord.java
index 54504c3c1e247..3ba2210504d67 100644
--- a/services/core/java/com/android/server/am/PendingIntentRecord.java
+++ b/services/core/java/com/android/server/am/PendingIntentRecord.java
@@ -508,7 +508,7 @@ public final class PendingIntentRecord extends IIntentSender.Stub {
         }
         if (key.requestIntent != null) {
             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) {
             pw.print(prefix); pw.print("sent="); pw.print(sent);
diff --git a/services/core/java/com/android/server/am/ServiceRecord.java b/services/core/java/com/android/server/am/ServiceRecord.java
index cc4b160332e5c..5106b0e435d75 100644
--- a/services/core/java/com/android/server/am/ServiceRecord.java
+++ b/services/core/java/com/android/server/am/ServiceRecord.java
@@ -256,7 +256,7 @@ final class ServiceRecord extends Binder implements ComponentName.WithComponentN
         }
         if (intent != null) {
             intent.getIntent().writeToProto(proto, ServiceRecordProto.INTENT, false, true, false,
-                    true);
+                    false);
         }
         proto.write(ServiceRecordProto.PACKAGE_NAME, packageName);
         proto.write(ServiceRecordProto.PROCESS_NAME, processName);
@@ -358,7 +358,7 @@ final class ServiceRecord extends Binder implements ComponentName.WithComponentN
 
     void dump(PrintWriter pw, String prefix) {
         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.print(prefix); pw.print("packageName="); pw.println(packageName);
         pw.print(prefix); pw.print("processName="); pw.println(processName);
diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java
index 6c74fd35b623b..d0af6936e2c6c 100644
--- a/services/core/java/com/android/server/wm/ActivityRecord.java
+++ b/services/core/java/com/android/server/wm/ActivityRecord.java
@@ -751,7 +751,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
                 pw.print(" launchedFromPackage="); pw.print(launchedFromPackage);
                 pw.print(" userId="); pw.println(mUserId);
         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(" task="); pw.println(task);
         pw.print(prefix); pw.print("taskAffinity="); pw.println(taskAffinity);
@@ -846,7 +846,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
                 if (intent == null) {
                     pw.println("null");
                 } else {
-                    pw.println(intent.toShortString(false, true, false, true));
+                    pw.println(intent.toShortString(false, true, false, false));
                 }
             }
         }
diff --git a/services/core/java/com/android/server/wm/ActivityStackSupervisor.java b/services/core/java/com/android/server/wm/ActivityStackSupervisor.java
index 887ece544d3e6..191e87056c05f 100644
--- a/services/core/java/com/android/server/wm/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/wm/ActivityStackSupervisor.java
@@ -2247,7 +2247,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks {
                     // Complete + brief == give a summary.  Isn't that obvious?!?
                     if (lastTask.intent != null) {
                         pw.print(prefix); pw.print("  ");
-                                pw.println(lastTask.intent.toInsecureStringWithClip());
+                                pw.println(lastTask.intent.toInsecureString());
                     }
                 }
             }
diff --git a/services/core/java/com/android/server/wm/TaskRecord.java b/services/core/java/com/android/server/wm/TaskRecord.java
index 463a445e9398e..89499d695dd06 100644
--- a/services/core/java/com/android/server/wm/TaskRecord.java
+++ b/services/core/java/com/android/server/wm/TaskRecord.java
@@ -2371,14 +2371,14 @@ class TaskRecord extends ConfigurationContainer {
         if (intent != null) {
             StringBuilder sb = new StringBuilder(128);
             sb.append(prefix); sb.append("intent={");
-            intent.toShortString(sb, false, true, false, true);
+            intent.toShortString(sb, false, true, false, false);
             sb.append('}');
             pw.println(sb.toString());
         }
         if (affinityIntent != null) {
             StringBuilder sb = new StringBuilder(128);
             sb.append(prefix); sb.append("affinityIntent={");
-            affinityIntent.toShortString(sb, false, true, false, true);
+            affinityIntent.toShortString(sb, false, true, false, false);
             sb.append('}');
             pw.println(sb.toString());
         }