Merge "Rename color transform to color mode and persist the value." into nyc-mr1-dev (f8bc27d9) · Commits · e / os / android_frameworks_base

core/java/android/hardware/display/DisplayManagerGlobal.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -354,9 +354,9 @@ public final class DisplayManagerGlobal {
		}
		}

		public void requestColorTransform(int displayId, int colorTransformId) {
		public void requestColorMode(int displayId, int colorMode) {
		try {
		mDm.requestColorTransform(displayId, colorTransformId);
		mDm.requestColorMode(displayId, colorMode);
		} catch (RemoteException ex) {
		throw ex.rethrowFromSystemServer();
		}

core/java/android/hardware/display/IDisplayManager.aidl

+2 −2

Original line number	Diff line number	Diff line
		@@ -59,8 +59,8 @@ interface IDisplayManager {
		// No permissions required.
		WifiDisplayStatus getWifiDisplayStatus();

		// Requires CONFIGURE_DISPLAY_COLOR_TRANSFORM
		void requestColorTransform(int displayId, int colorTransformId);
		// Requires CONFIGURE_DISPLAY_COLOR_MODE
		void requestColorMode(int displayId, int colorMode);

		// Requires CAPTURE_VIDEO_OUTPUT, CAPTURE_SECURE_VIDEO_OUTPUT, or an appropriate
		// MediaProjection token for certain combinations of flags.

core/java/android/view/Display.java

+33 −108

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@ import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		import java.util.Arrays;

		import static android.Manifest.permission.CONFIGURE_DISPLAY_COLOR_TRANSFORM;
		import static android.Manifest.permission.CONFIGURE_DISPLAY_COLOR_MODE;

		/**
		* Provides information about the size and density of a logical display.
		@@ -284,6 +284,27 @@ public final class Display {
		*/
		public static final int STATE_DOZE_SUSPEND = 4;

		/* The color mode constants defined below must be kept in sync with the ones in
		* system/graphics.h */

		/**
		* Display color mode: The current color mode is unknown or invalid.
		* @hide
		*/
		public static final int COLOR_MODE_INVALID = -1;

		/**
		* Display color mode: The default or native gamut of the display.
		* @hide
		*/
		public static final int COLOR_MODE_DEFAULT = 0;

		/**
		* Display color mode: SRGB
		* @hide
		*/
		public static final int COLOR_MODE_SRGB = 7;

		/**
		* Internal method to create a display.
		* Applications should use {@link android.view.WindowManager#getDefaultDisplay()}
		@@ -696,33 +717,22 @@ public final class Display {
		}

		/**
		* Request the display applies a color transform.
		* Request the display applies a color mode.
		* @hide
		*/
		@RequiresPermission(CONFIGURE_DISPLAY_COLOR_TRANSFORM)
		public void requestColorTransform(ColorTransform colorTransform) {
		mGlobal.requestColorTransform(mDisplayId, colorTransform.getId());
		}

		/**
		* Returns the active color transform of this display
		* @hide
		*/
		public ColorTransform getColorTransform() {
		synchronized (this) {
		updateDisplayInfoLocked();
		return mDisplayInfo.getColorTransform();
		}
		@RequiresPermission(CONFIGURE_DISPLAY_COLOR_MODE)
		public void requestColorMode(int colorMode) {
		mGlobal.requestColorMode(mDisplayId, colorMode);
		}

		/**
		* Returns the default color transform of this display
		* Returns the active color mode of this display
		* @hide
		*/
		public ColorTransform getDefaultColorTransform() {
		public int getColorMode() {
		synchronized (this) {
		updateDisplayInfoLocked();
		return mDisplayInfo.getDefaultColorTransform();
		return mDisplayInfo.colorMode;
		}
		}

		@@ -737,14 +747,14 @@ public final class Display {
		}

		/**
		* Gets the supported color transforms of this device.
		* Gets the supported color modes of this device.
		* @hide
		*/
		public ColorTransform[] getSupportedColorTransforms() {
		public int[] getSupportedColorModes() {
		synchronized (this) {
		updateDisplayInfoLocked();
		ColorTransform[] transforms = mDisplayInfo.supportedColorTransforms;
		return Arrays.copyOf(transforms, transforms.length);
		int[] colorModes = mDisplayInfo.supportedColorModes;
		return Arrays.copyOf(colorModes, colorModes.length);
		}
		}

		@@ -1263,89 +1273,4 @@ public final class Display {
		return 0;
		}
		}

		/**
		* A color transform supported by a given display.
		*
		* @see Display#getSupportedColorTransforms()
		* @hide
		*/
		public static final class ColorTransform implements Parcelable {
		public static final ColorTransform[] EMPTY_ARRAY = new ColorTransform[0];

		private final int mId;
		private final int mColorTransform;

		public ColorTransform(int id, int colorTransform) {
		mId = id;
		mColorTransform = colorTransform;
		}

		public int getId() {
		return mId;
		}

		public int getColorTransform() {
		return mColorTransform;
		}

		@Override
		public boolean equals(Object other) {
		if (this == other) {
		return true;
		}
		if (!(other instanceof ColorTransform)) {
		return false;
		}
		ColorTransform that = (ColorTransform) other;
		return mId == that.mId
		&& mColorTransform == that.mColorTransform;
		}

		@Override
		public int hashCode() {
		int hash = 1;
		hash = hash * 17 + mId;
		hash = hash * 17 + mColorTransform;
		return hash;
		}

		@Override
		public String toString() {
		return new StringBuilder("{")
		.append("id=").append(mId)
		.append(", colorTransform=").append(mColorTransform)
		.append("}")
		.toString();
		}

		@Override
		public int describeContents() {
		return 0;
		}

		private ColorTransform(Parcel in) {
		this(in.readInt(), in.readInt());
		}

		@Override
		public void writeToParcel(Parcel out, int parcelableFlags) {
		out.writeInt(mId);
		out.writeInt(mColorTransform);
		}

		@SuppressWarnings("hiding")
		public static final Parcelable.Creator<ColorTransform> CREATOR
		= new Parcelable.Creator<ColorTransform>() {
		@Override
		public ColorTransform createFromParcel(Parcel in) {
		return new ColorTransform(in);
		}

		@Override
		public ColorTransform[] newArray(int size) {
		return new ColorTransform[size];
		}
		};
		}
		}

core/java/android/view/DisplayInfo.java

+22 −48

Original line number	Diff line number	Diff line
		@@ -169,14 +169,11 @@ public final class DisplayInfo implements Parcelable {
		*/
		public Display.Mode[] supportedModes = Display.Mode.EMPTY_ARRAY;

		/** The active color transform. */
		public int colorTransformId;
		/** The active color mode. */
		public int colorMode;

		/** The default color transform. */
		public int defaultColorTransformId;

		/** The list of supported color transforms */
		public Display.ColorTransform[] supportedColorTransforms = Display.ColorTransform.EMPTY_ARRAY;
		/** The list of supported color modes */
		public int[] supportedColorModes = { Display.COLOR_MODE_DEFAULT };

		/** The display's HDR capabilities */
		public Display.HdrCapabilities hdrCapabilities;
		@@ -291,8 +288,8 @@ public final class DisplayInfo implements Parcelable {
		&& rotation == other.rotation
		&& modeId == other.modeId
		&& defaultModeId == other.defaultModeId
		&& colorTransformId == other.colorTransformId
		&& defaultColorTransformId == other.defaultColorTransformId
		&& colorMode == other.colorMode
		&& Objects.equal(supportedColorModes, other.supportedColorModes)
		&& Objects.equal(hdrCapabilities, other.hdrCapabilities)
		&& logicalDensityDpi == other.logicalDensityDpi
		&& physicalXDpi == other.physicalXDpi
		@@ -332,10 +329,9 @@ public final class DisplayInfo implements Parcelable {
		modeId = other.modeId;
		defaultModeId = other.defaultModeId;
		supportedModes = Arrays.copyOf(other.supportedModes, other.supportedModes.length);
		colorTransformId = other.colorTransformId;
		defaultColorTransformId = other.defaultColorTransformId;
		supportedColorTransforms = Arrays.copyOf(
		other.supportedColorTransforms, other.supportedColorTransforms.length);
		colorMode = other.colorMode;
		supportedColorModes = Arrays.copyOf(
		other.supportedColorModes, other.supportedColorModes.length);
		hdrCapabilities = other.hdrCapabilities;
		logicalDensityDpi = other.logicalDensityDpi;
		physicalXDpi = other.physicalXDpi;
		@@ -373,12 +369,11 @@ public final class DisplayInfo implements Parcelable {
		for (int i = 0; i < nModes; i++) {
		supportedModes[i] = Display.Mode.CREATOR.createFromParcel(source);
		}
		colorTransformId = source.readInt();
		defaultColorTransformId = source.readInt();
		int nColorTransforms = source.readInt();
		supportedColorTransforms = new Display.ColorTransform[nColorTransforms];
		for (int i = 0; i < nColorTransforms; i++) {
		supportedColorTransforms[i] = Display.ColorTransform.CREATOR.createFromParcel(source);
		colorMode = source.readInt();
		int nColorModes = source.readInt();
		supportedColorModes = new int[nColorModes];
		for (int i = 0; i < nColorModes; i++) {
		supportedColorModes[i] = source.readInt();
		}
		hdrCapabilities = source.readParcelable(null);
		logicalDensityDpi = source.readInt();
		@@ -418,11 +413,10 @@ public final class DisplayInfo implements Parcelable {
		for (int i = 0; i < supportedModes.length; i++) {
		supportedModes[i].writeToParcel(dest, flags);
		}
		dest.writeInt(colorTransformId);
		dest.writeInt(defaultColorTransformId);
		dest.writeInt(supportedColorTransforms.length);
		for (int i = 0; i < supportedColorTransforms.length; i++) {
		supportedColorTransforms[i].writeToParcel(dest, flags);
		dest.writeInt(colorMode);
		dest.writeInt(supportedColorModes.length);
		for (int i = 0; i < supportedColorModes.length; i++) {
		dest.writeInt(supportedColorModes[i]);
		}
		dest.writeParcelable(hdrCapabilities, flags);
		dest.writeInt(logicalDensityDpi);
		@@ -496,24 +490,6 @@ public final class DisplayInfo implements Parcelable {
		return result;
		}

		public Display.ColorTransform getColorTransform() {
		return findColorTransform(colorTransformId);
		}

		public Display.ColorTransform getDefaultColorTransform() {
		return findColorTransform(defaultColorTransformId);
		}

		private Display.ColorTransform findColorTransform(int colorTransformId) {
		for (int i = 0; i < supportedColorTransforms.length; i++) {
		Display.ColorTransform colorTransform = supportedColorTransforms[i];
		if (colorTransform.getId() == colorTransformId) {
		return colorTransform;
		}
		}
		throw new IllegalStateException("Unable to locate color transform: " + colorTransformId);
		}

		public void getAppMetrics(DisplayMetrics outMetrics) {
		getAppMetrics(outMetrics, CompatibilityInfo.DEFAULT_COMPATIBILITY_INFO, null);
		}
		@@ -615,12 +591,10 @@ public final class DisplayInfo implements Parcelable {
		sb.append(defaultModeId);
		sb.append(", modes ");
		sb.append(Arrays.toString(supportedModes));
		sb.append(", colorTransformId ");
		sb.append(colorTransformId);
		sb.append(", defaultColorTransformId ");
		sb.append(defaultColorTransformId);
		sb.append(", supportedColorTransforms ");
		sb.append(Arrays.toString(supportedColorTransforms));
		sb.append(", colorMode ");
		sb.append(colorMode);
		sb.append(", supportedColorModes ");
		sb.append(Arrays.toString(supportedColorModes));
		sb.append(", hdrCapabilities ");
		sb.append(hdrCapabilities);
		sb.append(", rotation ");

core/java/android/view/SurfaceControl.java

+27 −6

Original line number	Diff line number	Diff line
		@@ -82,6 +82,10 @@ public class SurfaceControl {
		IBinder displayToken);
		private static native int nativeGetActiveConfig(IBinder displayToken);
		private static native boolean nativeSetActiveConfig(IBinder displayToken, int id);
		private static native int[] nativeGetDisplayColorModes(IBinder displayToken);
		private static native int nativeGetActiveColorMode(IBinder displayToken);
		private static native boolean nativeSetActiveColorMode(IBinder displayToken,
		int colorMode);
		private static native void nativeSetDisplayPowerMode(
		IBinder displayToken, int mode);
		private static native void nativeDeferTransactionUntil(long nativeObject,
		@@ -547,7 +551,6 @@ public class SurfaceControl {
		public boolean secure;
		public long appVsyncOffsetNanos;
		public long presentationDeadlineNanos;
		public int colorTransform;

		public PhysicalDisplayInfo() {
		}
		@@ -571,8 +574,7 @@ public class SurfaceControl {
		&& yDpi == other.yDpi
		&& secure == other.secure
		&& appVsyncOffsetNanos == other.appVsyncOffsetNanos
		&& presentationDeadlineNanos == other.presentationDeadlineNanos
		&& colorTransform == other.colorTransform;
		&& presentationDeadlineNanos == other.presentationDeadlineNanos;
		}

		@Override
		@@ -590,7 +592,6 @@ public class SurfaceControl {
		secure = other.secure;
		appVsyncOffsetNanos = other.appVsyncOffsetNanos;
		presentationDeadlineNanos = other.presentationDeadlineNanos;
		colorTransform = other.colorTransform;
		}

		// For debugging purposes
		@@ -599,8 +600,7 @@ public class SurfaceControl {
		return "PhysicalDisplayInfo{" + width + " x " + height + ", " + refreshRate + " fps, "
		+ "density " + density + ", " + xDpi + " x " + yDpi + " dpi, secure " + secure
		+ ", appVsyncOffset " + appVsyncOffsetNanos
		+ ", bufferDeadline " + presentationDeadlineNanos
		+ ", colorTransform " + colorTransform + "}";
		+ ", bufferDeadline " + presentationDeadlineNanos + "}";
		}
		}

		@@ -632,6 +632,27 @@ public class SurfaceControl {
		return nativeSetActiveConfig(displayToken, id);
		}

		public static int[] getDisplayColorModes(IBinder displayToken) {
		if (displayToken == null) {
		throw new IllegalArgumentException("displayToken must not be null");
		}
		return nativeGetDisplayColorModes(displayToken);
		}

		public static int getActiveColorMode(IBinder displayToken) {
		if (displayToken == null) {
		throw new IllegalArgumentException("displayToken must not be null");
		}
		return nativeGetActiveColorMode(displayToken);
		}

		public static boolean setActiveColorMode(IBinder displayToken, int colorMode) {
		if (displayToken == null) {
		throw new IllegalArgumentException("displayToken must not be null");
		}
		return nativeSetActiveColorMode(displayToken, colorMode);
		}

		public static void setDisplayProjection(IBinder displayToken,
		int orientation, Rect layerStackRect, Rect displayRect) {
		if (displayToken == null) {