Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe4ecd51 authored by Marin Shalamanov's avatar Marin Shalamanov Committed by Automerger Merge Worker
Browse files

Merge "Rename helper function" into sc-dev am: 3bd70615 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14102693

Change-Id: Ia3ad03a18f4f5c601ff824ff51e706c488c54913
parents 7a6a5185 3bd70615

core/jni/android_view_SurfaceControl.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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);