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

Commit 5e8e35ad authored by Dominik Laskowski's avatar Dominik Laskowski Committed by android-build-merger
Browse files

Merge "SF: Fix getAllowedDisplayConfigs in multi-display mode" into qt-dev 

am: bc1e33ff

Change-Id: I5ee0ee34c98c5ef3040aa9c959e897956df9744a
parents 8a901f73 bc1e33ff

services/surfaceflinger/SurfaceFlinger.cpp

+6 −3
Original line number Diff line number Diff line
@@ -5876,12 +5876,15 @@ status_t SurfaceFlinger::getAllowedDisplayConfigs(const sp<IBinder>& displayToke 


    Mutex::Autolock lock(mStateLock);



    if (displayToken != getInternalDisplayTokenLocked()) {

        ALOGE("%s is only supported for the internal display", __FUNCTION__);

    const auto display = getDisplayDeviceLocked(displayToken);

    if (!display) {

        return NAME_NOT_FOUND;

    }



    if (display->isPrimary()) {

        outAllowedConfigs->assign(mAllowedDisplayConfigs.begin(), mAllowedDisplayConfigs.end());

    }



    return NO_ERROR;

}