From 6f4fe2b1956f4240e2a62e06b602db7781f3eea7 Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Thu, 3 Dec 2020 16:35:13 -0500
Subject: [PATCH] Update for API council feedback

Test: N/A
Fixes: 169331021
Change-Id: I8ae9133d21f177db1a98fa43fde28a3f81820d5f
---
 core/api/current.txt                          |  7 +--
 .../graphics/ParcelableColorSpace.java        | 43 +++----------------
 .../shared/recents/utilities/BitmapUtil.java  |  3 +-
 3 files changed, 9 insertions(+), 44 deletions(-)

diff --git a/core/api/current.txt b/core/api/current.txt
index 714f59ec13be6..0818158a9e784 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -15259,16 +15259,11 @@ package android.graphics {
     ctor public PaintFlagsDrawFilter(int, int);
   }
 
-  public final class ParcelableColorSpace extends android.graphics.ColorSpace implements android.os.Parcelable {
+  public final class ParcelableColorSpace implements android.os.Parcelable {
     ctor public ParcelableColorSpace(@NonNull android.graphics.ColorSpace);
     method public int describeContents();
-    method @NonNull public float[] fromXyz(@NonNull float[]);
     method @NonNull public android.graphics.ColorSpace getColorSpace();
-    method public float getMaxValue(int);
-    method public float getMinValue(int);
     method public static boolean isParcelable(@NonNull android.graphics.ColorSpace);
-    method public boolean isWideGamut();
-    method @NonNull public float[] toXyz(@NonNull float[]);
     method public void writeToParcel(@NonNull android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.graphics.ParcelableColorSpace> CREATOR;
   }
diff --git a/graphics/java/android/graphics/ParcelableColorSpace.java b/graphics/java/android/graphics/ParcelableColorSpace.java
index 3260849244508..748d66cb5f6c1 100644
--- a/graphics/java/android/graphics/ParcelableColorSpace.java
+++ b/graphics/java/android/graphics/ParcelableColorSpace.java
@@ -22,18 +22,19 @@ import android.os.Parcel;
 import android.os.Parcelable;
 
 /**
- * A {@link Parcelable} {@link ColorSpace}. In order to enable parceling, the ColorSpace
- * must be either a {@link ColorSpace.Named Named} ColorSpace or a {@link ColorSpace.Rgb} instance
- * that has an ICC parametric transfer function as returned by {@link Rgb#getTransferParameters()}.
+ * A {@link Parcelable} wrapper for a {@link ColorSpace}. In order to enable parceling, the
+ * ColorSpace must be either a {@link ColorSpace.Named Named} ColorSpace or a
+ * {@link ColorSpace.Rgb} instance that has an ICC parametric transfer function as returned by
+ * {@link ColorSpace.Rgb#getTransferParameters()}.
  */
-public final class ParcelableColorSpace extends ColorSpace implements Parcelable {
+public final class ParcelableColorSpace implements Parcelable {
     private final ColorSpace mColorSpace;
 
     /**
      * Checks if the given ColorSpace is able to be parceled. A ColorSpace can only be
      * parceled if it is a {@link ColorSpace.Named Named} ColorSpace or a {@link ColorSpace.Rgb}
      * instance that has an ICC parametric transfer function as returned by
-     * {@link Rgb#getTransferParameters()}
+     * {@link ColorSpace.Rgb#getTransferParameters()}
      */
     public static boolean isParcelable(@NonNull ColorSpace colorSpace) {
         if (colorSpace.getId() == ColorSpace.MIN_ID) {
@@ -57,7 +58,6 @@ public final class ParcelableColorSpace extends ColorSpace implements Parcelable
      * to be parceled. See {@link #isParcelable(ColorSpace)}.
      */
     public ParcelableColorSpace(@NonNull ColorSpace colorSpace) {
-        super(colorSpace.getName(), colorSpace.getModel(), colorSpace.getId());
         mColorSpace = colorSpace;
 
         if (mColorSpace.getId() == ColorSpace.MIN_ID) {
@@ -138,31 +138,6 @@ public final class ParcelableColorSpace extends ColorSpace implements Parcelable
         }
     };
 
-    @Override
-    public boolean isWideGamut() {
-        return mColorSpace.isWideGamut();
-    }
-
-    @Override
-    public float getMinValue(int component) {
-        return mColorSpace.getMinValue(component);
-    }
-
-    @Override
-    public float getMaxValue(int component) {
-        return mColorSpace.getMaxValue(component);
-    }
-
-    @Override
-    public @NonNull float[] toXyz(@NonNull float[] v) {
-        return mColorSpace.toXyz(v);
-    }
-
-    @Override
-    public @NonNull float[] fromXyz(@NonNull float[] v) {
-        return mColorSpace.fromXyz(v);
-    }
-
     @Override
     public boolean equals(@Nullable Object o) {
         if (this == o) return true;
@@ -175,10 +150,4 @@ public final class ParcelableColorSpace extends ColorSpace implements Parcelable
     public int hashCode() {
         return mColorSpace.hashCode();
     }
-
-    /** @hide */
-    @Override
-    long getNativeInstance() {
-        return mColorSpace.getNativeInstance();
-    }
 }
diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/recents/utilities/BitmapUtil.java b/packages/SystemUI/shared/src/com/android/systemui/shared/recents/utilities/BitmapUtil.java
index b79fcbd439725..325bcfc622d76 100644
--- a/packages/SystemUI/shared/src/com/android/systemui/shared/recents/utilities/BitmapUtil.java
+++ b/packages/SystemUI/shared/src/com/android/systemui/shared/recents/utilities/BitmapUtil.java
@@ -81,6 +81,7 @@ public final class BitmapUtil {
         HardwareBuffer buffer = bundle.getParcelable(KEY_BUFFER);
         ParcelableColorSpace colorSpace = bundle.getParcelable(KEY_COLOR_SPACE);
 
-        return Bitmap.wrapHardwareBuffer(Objects.requireNonNull(buffer), colorSpace);
+        return Bitmap.wrapHardwareBuffer(Objects.requireNonNull(buffer),
+                colorSpace.getColorSpace());
     }
 }