Merge "Revert "Hook up HDR capabilities from native SurfaceControl"" into nyc-dev

core/java/android/view/Display.java

@@ -1163,14 +1163,6 @@ public final class Display {
         public HdrCapabilities() {
         }
 
-        public HdrCapabilities(int[] supportedHdrTypes, float maxLuminance,
-                float maxAverageLuminance, float minLuminance) {
-            mSupportedHdrTypes = supportedHdrTypes;
-            mMaxLuminance = maxLuminance;
-            mMaxAverageLuminance = maxAverageLuminance;
-            mMinLuminance = minLuminance;
-        }
-
         /**
          * Gets the supported HDR types of this display.
          * Returns empty array if HDR is not supported by the display.

core/jni/android_view_SurfaceControl.cpp

@@ -33,7 +33,6 @@
 #include <memory>
 #include <stdio.h>
 #include <ui/DisplayInfo.h>
-#include <ui/HdrCapabilities.h>
 #include <ui/FrameStats.h>
 #include <ui/Rect.h>
 #include <ui/Region.h>
@@ -84,11 +83,6 @@ static struct {
     jmethodID init;
 } gWindowAnimationFrameStatsClassInfo;
 
-static struct {
-    jclass clazz;
-    jmethodID ctor;
-} gHdrCapabilitiesClassInfo;
-
 // ----------------------------------------------------------------------------
 
 static jlong nativeCreate(JNIEnv* env, jclass clazz, jobject sessionObj,
@@ -609,22 +603,6 @@ static jobject nativeGetHandle(JNIEnv* env, jclass clazz, jlong nativeObject) {
     return javaObjectForIBinder(env, ctrl->getHandle());
 }
 
-static jobject nativeGetHdrCapabilities(JNIEnv* env, jclass clazz, jobject tokenObject) {
-    sp<IBinder> token(ibinderForJavaObject(env, tokenObject));
-    if (token == NULL) return NULL;
-
-    HdrCapabilities capabilities;
-    SurfaceComposerClient::getHdrCapabilities(token, &capabilities);
-
-    const auto& types = capabilities.getSupportedHdrTypes();
-    auto typesArray = env->NewIntArray(types.size());
-    env->SetIntArrayRegion(typesArray, 0, types.size(), types.data());
-
-    return env->NewObject(gHdrCapabilitiesClassInfo.clazz, gPhysicalDisplayInfoClassInfo.ctor,
-            typesArray, capabilities.getDesiredMaxLuminance(),
-            capabilities.getDesiredMaxAverageLuminance(), capabilities.getDesiredMinLuminance());
-}
-
 // ----------------------------------------------------------------------------
 
 static const JNINativeMethod sSurfaceControlMethods[] = {
@@ -746,11 +724,6 @@ int register_android_view_SurfaceControl(JNIEnv* env)
             animFrameStatsClazz, "init", "(J[J)V");
     gWindowAnimationFrameStatsClassInfo.UNDEFINED_TIME_NANO = undefined_time_nano;
 
-    jclass hdrCapabilitiesClazz = FindClassOrDie(env, "android/view/Display$HdrCapabilities");
-    gHdrCapabilitiesClassInfo.clazz = MakeGlobalRefOrDie(env, hdrCapabilitiesClazz);
-    gHdrCapabilitiesClassInfo.ctor = GetMethodIDOrDie(env, hdrCapabilitiesClazz, "<init>",
-            "([IFFF)V");
-
     return err;
 }