Unhide getHdrCapabilities and HdrCapabilities. (da802f51) · Commits · e / os / android_frameworks_base

api/current.txt

+16 −0

Original line number	Diff line number	Diff line
		@@ -40935,6 +40935,7 @@ package android.view {
		method public void getCurrentSizeRange(android.graphics.Point, android.graphics.Point);
		method public int getDisplayId();
		method public int getFlags();
		method public android.view.Display.HdrCapabilities getHdrCapabilities();
		method public deprecated int getHeight();
		method public void getMetrics(android.util.DisplayMetrics);
		method public android.view.Display.Mode getMode();
		@@ -40967,6 +40968,21 @@ package android.view {
		field public static final int STATE_UNKNOWN = 0; // 0x0
		}

		public static final class Display.HdrCapabilities implements android.os.Parcelable {
		ctor public Display.HdrCapabilities(int[], float, float, float);
		method public int describeContents();
		method public float getDesiredMaxAverageLuminance();
		method public float getDesiredMaxLuminance();
		method public float getDesiredMinLuminance();
		method public int[] getSupportedHdrTypes();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.view.Display.HdrCapabilities> CREATOR;
		field public static final int HDR_TYPE_DOLBY_VISION = 1; // 0x1
		field public static final int HDR_TYPE_HDR10 = 2; // 0x2
		field public static final int HDR_TYPE_HLG = 3; // 0x3
		field public static final float INVALID_LUMINANCE = -1.0f;
		}

		public static final class Display.Mode implements android.os.Parcelable {
		method public int describeContents();
		method public int getModeId();

+16 −0

Original line number	Diff line number	Diff line
		@@ -43949,6 +43949,7 @@ package android.view {
		method public void getCurrentSizeRange(android.graphics.Point, android.graphics.Point);
		method public int getDisplayId();
		method public int getFlags();
		method public android.view.Display.HdrCapabilities getHdrCapabilities();
		method public deprecated int getHeight();
		method public void getMetrics(android.util.DisplayMetrics);
		method public android.view.Display.Mode getMode();
		@@ -43981,6 +43982,21 @@ package android.view {
		field public static final int STATE_UNKNOWN = 0; // 0x0
		}

		public static final class Display.HdrCapabilities implements android.os.Parcelable {
		ctor public Display.HdrCapabilities(int[], float, float, float);
		method public int describeContents();
		method public float getDesiredMaxAverageLuminance();
		method public float getDesiredMaxLuminance();
		method public float getDesiredMinLuminance();
		method public int[] getSupportedHdrTypes();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.view.Display.HdrCapabilities> CREATOR;
		field public static final int HDR_TYPE_DOLBY_VISION = 1; // 0x1
		field public static final int HDR_TYPE_HDR10 = 2; // 0x2
		field public static final int HDR_TYPE_HLG = 3; // 0x3
		field public static final float INVALID_LUMINANCE = -1.0f;
		}

		public static final class Display.Mode implements android.os.Parcelable {
		method public int describeContents();
		method public int getModeId();

+16 −0

Original line number	Diff line number	Diff line
		@@ -41013,6 +41013,7 @@ package android.view {
		method public void getCurrentSizeRange(android.graphics.Point, android.graphics.Point);
		method public int getDisplayId();
		method public int getFlags();
		method public android.view.Display.HdrCapabilities getHdrCapabilities();
		method public deprecated int getHeight();
		method public void getMetrics(android.util.DisplayMetrics);
		method public android.view.Display.Mode getMode();
		@@ -41045,6 +41046,21 @@ package android.view {
		field public static final int STATE_UNKNOWN = 0; // 0x0
		}

		public static final class Display.HdrCapabilities implements android.os.Parcelable {
		ctor public Display.HdrCapabilities(int[], float, float, float);
		method public int describeContents();
		method public float getDesiredMaxAverageLuminance();
		method public float getDesiredMaxLuminance();
		method public float getDesiredMinLuminance();
		method public int[] getSupportedHdrTypes();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.view.Display.HdrCapabilities> CREATOR;
		field public static final int HDR_TYPE_DOLBY_VISION = 1; // 0x1
		field public static final int HDR_TYPE_HDR10 = 2; // 0x2
		field public static final int HDR_TYPE_HLG = 3; // 0x3
		field public static final float INVALID_LUMINANCE = -1.0f;
		}

		public static final class Display.Mode implements android.os.Parcelable {
		method public int describeContents();
		method public int getModeId();

+7 −2

Original line number	Diff line number	Diff line
		@@ -719,7 +719,6 @@ public final class Display {

		/**
		* Returns the display's HDR capabilities.
		* @hide
		*/
		public HdrCapabilities getHdrCapabilities() {
		synchronized (this) {
		@@ -1130,7 +1129,6 @@ public final class Display {
		* For example, what HDR types it supports and details about the desired luminance data.
		* <p>You can get an instance for a given {@link Display} object with
		* {@link Display#getHdrCapabilities getHdrCapabilities()}.
		* @hide
		*/
		public static final class HdrCapabilities implements Parcelable {
		/**
		@@ -1150,6 +1148,7 @@ public final class Display {
		*/
		public static final int HDR_TYPE_HLG = 3;

		/** @hide */
		@IntDef({
		HDR_TYPE_DOLBY_VISION,
		HDR_TYPE_HDR10,
		@@ -1163,6 +1162,9 @@ public final class Display {
		private float mMaxAverageLuminance = INVALID_LUMINANCE;
		private float mMinLuminance = INVALID_LUMINANCE;

		/**
		* @hide
		*/
		public HdrCapabilities() {
		}

		@@ -1216,6 +1218,9 @@ public final class Display {
		readFromParcel(source);
		}

		/**
		* @hide
		*/
		public void readFromParcel(Parcel source) {
		int types = source.readInt();
		mSupportedHdrTypes = new int[types];