From 3a0c6e1eaa9187f66d6a18d5af421b6e47741ef5 Mon Sep 17 00:00:00 2001
From: Peiyong Lin <lpy@google.com>
Date: Mon, 16 Apr 2018 11:05:29 -0700
Subject: [PATCH] [JNI] Adapt graphics::common:V1_0::Hdr from HAL.

BUG: 77156734
Test: Build, flash, watch Youtube HDR
Change-Id: I38ab4fa2fcec7bcb632889457cc135302d7efc06
---
 core/jni/android_view_SurfaceControl.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/jni/android_view_SurfaceControl.cpp b/core/jni/android_view_SurfaceControl.cpp
index 3f58afa8d51ea..5b4b5f2a2264d 100644
--- a/core/jni/android_view_SurfaceControl.cpp
+++ b/core/jni/android_view_SurfaceControl.cpp
@@ -877,8 +877,12 @@ static jobject nativeGetHdrCapabilities(JNIEnv* env, jclass clazz, jobject token
     SurfaceComposerClient::getHdrCapabilities(token, &capabilities);
 
     const auto& types = capabilities.getSupportedHdrTypes();
+    std::vector<int32_t> intTypes;
+    for (auto type : types) {
+        intTypes.push_back(static_cast<int32_t>(type));
+    }
     auto typesArray = env->NewIntArray(types.size());
-    env->SetIntArrayRegion(typesArray, 0, types.size(), types.data());
+    env->SetIntArrayRegion(typesArray, 0, intTypes.size(), intTypes.data());
 
     return env->NewObject(gHdrCapabilitiesClassInfo.clazz, gHdrCapabilitiesClassInfo.ctor,
             typesArray, capabilities.getDesiredMaxLuminance(),