commit 3a0c6e1eaa9187f66d6a18d5af421b6e47741ef5
author Peiyong Lin <lpy@google.com> Mon Apr 16 11:05:29 2018 -0700
committer Peiyong Lin <lpy@google.com> Mon Apr 16 11:05:29 2018 -0700
tree cc3a0624631e5dfe2235546a9a568225adff7f25
parent a5bacea405815c9b3aafb5db6aba06791c80c540

[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

diff --git a/core/jni/android_view_SurfaceControl.cpp b/core/jni/android_view_SurfaceControl.cpp
index 3f58afa..5b4b5f2 100644
--- a/core/jni/android_view_SurfaceControl.cpp
+++ b/core/jni/android_view_SurfaceControl.cpp
@@ -877,8 +877,12 @@
     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(),