Merge "Update for API council feedback" (f3eda767) · Commits · e / os / android_frameworks_base

core/api/current.txt

+1 −6

Original line number	Diff line number	Diff line
		@@ -15279,16 +15279,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;
		}

graphics/java/android/graphics/ParcelableColorSpace.java

+6 −37

Original line number	Diff line number	Diff line
		@@ -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();
		}
		}

packages/SystemUI/shared/src/com/android/systemui/shared/recents/utilities/BitmapUtil.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -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());
		}
		}