diff options
| author | 2021-04-13 10:36:18 +0000 | |
|---|---|---|
| committer | 2021-04-13 10:36:18 +0000 | |
| commit | 3bd70615ae595edccf58cb27d480e9906cb08f3d (patch) | |
| tree | 54c0737062849959aaa657cb63bf849f574f2de9 | |
| parent | 797d8fffc52259a33335a15fe32c8663334ccefd (diff) | |
| parent | eb709a0cb52caa14086dba4a8d5c2c7450afddf3 (diff) | |
Merge "Rename helper function" into sc-dev
| -rw-r--r-- | core/jni/android_view_SurfaceControl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/jni/android_view_SurfaceControl.cpp b/core/jni/android_view_SurfaceControl.cpp index 354e3a4d67ed..906367b1fa94 100644 --- a/core/jni/android_view_SurfaceControl.cpp +++ b/core/jni/android_view_SurfaceControl.cpp @@ -1072,7 +1072,7 @@ static jobject convertDisplayModeToJavaObject(JNIEnv* env, const ui::DisplayMode return object; } -jobject convertDeviceProductInfoToJavaObject(JNIEnv* env, const HdrCapabilities& capabilities) { +jobject convertHdrCapabilitiesToJavaObject(JNIEnv* env, const HdrCapabilities& capabilities) { const auto& types = capabilities.getSupportedHdrTypes(); std::vector<int32_t> intTypes; for (auto type : types) { @@ -1129,7 +1129,7 @@ static jobject nativeGetDynamicDisplayInfo(JNIEnv* env, jclass clazz, jobject to static_cast<jint>(info.activeColorMode)); env->SetObjectField(object, gDynamicDisplayInfoClassInfo.hdrCapabilities, - convertDeviceProductInfoToJavaObject(env, info.hdrCapabilities)); + convertHdrCapabilitiesToJavaObject(env, info.hdrCapabilities)); env->SetBooleanField(object, gDynamicDisplayInfoClassInfo.autoLowLatencyModeSupported, info.autoLowLatencyModeSupported); |