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

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

Merge "SF: Don't override active mode with desired mode" into sc-dev am: c6465a54 

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

Change-Id: I7003c748c6418e546219b39fc249daf9ba1a3547
parents 344de682 c6465a54

services/surfaceflinger/SurfaceFlinger.cpp

+0 −5
Original line number Diff line number Diff line
@@ -914,11 +914,6 @@ status_t SurfaceFlinger::getDynamicDisplayInfo(const sp<IBinder>& displayToken, 
    }



    info->activeDisplayModeId = static_cast<int32_t>(display->getActiveMode()->getId().value());

    if (display->isPrimary()) {

        if (const auto mode = getDesiredActiveMode()) {

            info->activeDisplayModeId = static_cast<int32_t>(mode->modeId.value());

        }

    }



    const auto& supportedModes = display->getSupportedModes();

    info->supportedDisplayModes.clear();