Merge "Remove Point#dump"

core/api/current.txt

@@ -15543,7 +15543,6 @@ package android.graphics {
     ctor public Point(int, int);
     ctor public Point(@NonNull android.graphics.Point);
     method public int describeContents();
-    method public final void dump(@NonNull java.io.PrintWriter);
     method public final boolean equals(int, int);
     method public final void negate();
     method public final void offset(int, int);

core/java/android/view/RemoteAnimationTarget.java

@@ -270,7 +270,7 @@ public class RemoteAnimationTarget implements Parcelable {
         pw.print(" clipRect="); clipRect.printShortString(pw);
         pw.print(" contentInsets="); contentInsets.printShortString(pw);
         pw.print(" prefixOrderIndex="); pw.print(prefixOrderIndex);
-        pw.print(" position="); position.dump(pw);
+        pw.print(" position="); printPoint(position, pw);
         pw.print(" sourceContainerBounds="); sourceContainerBounds.printShortString(pw);
         pw.print(" screenSpaceBounds="); screenSpaceBounds.printShortString(pw);
         pw.print(" localBounds="); localBounds.printShortString(pw);
@@ -303,6 +303,10 @@ public class RemoteAnimationTarget implements Parcelable {
         proto.end(token);
     }
 
+    private static void printPoint(Point p, PrintWriter pw) {
+        pw.print("["); pw.print(p.x); pw.print(","); pw.print(p.y); pw.print("]");
+    }
+
     public static final @android.annotation.NonNull Creator<RemoteAnimationTarget> CREATOR
             = new Creator<RemoteAnimationTarget>() {
         public RemoteAnimationTarget createFromParcel(Parcel in) {

graphics/java/android/graphics/Point.java

@@ -20,8 +20,6 @@ import android.annotation.NonNull;
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import java.io.PrintWriter;
-
 /**
  * Point holds two integer coordinates
  */
@@ -72,17 +70,6 @@ public class Point implements Parcelable {
         return this.x == x && this.y == y;
     }
 
-    /**
-     * Dumps a human-readable shortened string of the point into the given
-     * stream
-     *
-     * @param pw The {@link PrintWriter} into which the string representation of
-     *           the point will be written.
-     */
-    public final void dump(@NonNull PrintWriter pw) {
-        pw.print("["); pw.print(x); pw.print(","); pw.print(y); pw.print("]");
-    }
-
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;