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

Commit 1339e361 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6013205 from abf91060 to qt-qpr2-release 

Change-Id: I68151c8cb102ff23a50c25d3171247fd99261fbc
parents de3f0c07 abf91060

services/surfaceflinger/SurfaceFlinger.cpp

+2 −1
Original line number Diff line number Diff line
@@ -6242,7 +6242,7 @@ status_t SurfaceFlinger::setAllowedDisplayConfigs(const sp<IBinder>& displayToke 
        return NO_ERROR;

    }



    postMessageSync(new LambdaMessage([&]() NO_THREAD_SAFETY_ANALYSIS {

    postMessageSync(new LambdaMessage([&]() {

        const auto display = getDisplayDeviceLocked(displayToken);

        if (!display) {

            ALOGE("Attempt to set allowed display configs for invalid display token %p",
@@ -6250,6 +6250,7 @@ status_t SurfaceFlinger::setAllowedDisplayConfigs(const sp<IBinder>& displayToke 
        } else if (display->isVirtual()) {

            ALOGW("Attempt to set allowed display configs for virtual display");

        } else {

            Mutex::Autolock lock(mStateLock);

            setAllowedDisplayConfigsInternal(display, allowedConfigs);

        }

    }));