commit 9789e55ac0fca7c7044b42208c89d82fffcae36d
author Peiyong Lin <lpy@google.com> Fri Jan 18 17:24:03 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 18 17:24:03 2019 +0000
tree dd9f53ceb08abfa633e6787ec5dd932c9f13d5f2
parent af102b9782b13f77278dedd70b9f815e66b1b82e
parent 173ae08d3fa9468ee28806d98e39a4c836e214c5

Merge "Add HDR_10_PLUS to HdrCapabilities."

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 36a21c7..02d703f 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -48541,6 +48541,7 @@
     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_HDR10_PLUS = 4; // 0x4
     field public static final int HDR_TYPE_HLG = 3; // 0x3
     field public static final float INVALID_LUMINANCE = -1.0f;
   }

core/java/android/view/Display.java

diff --git a/core/java/android/view/Display.java b/core/java/android/view/Display.java
index 4ead34e..f58efc9 100644
--- a/core/java/android/view/Display.java
+++ b/core/java/android/view/Display.java
@@ -1391,11 +1391,17 @@
          */
         public static final int HDR_TYPE_HLG = 3;
 
+        /**
+         * HDR10+ display.
+         */
+        public static final int HDR_TYPE_HDR10_PLUS = 4;
+
         /** @hide */
         @IntDef(prefix = { "HDR_TYPE_" }, value = {
                 HDR_TYPE_DOLBY_VISION,
                 HDR_TYPE_HDR10,
                 HDR_TYPE_HLG,
+                HDR_TYPE_HDR10_PLUS,
         })
         @Retention(RetentionPolicy.SOURCE)
         public @interface HdrType {}