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

Commit 6e921da2 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "SurfaceFlinger: do not assert if setActiveConfigWithConstraints fails"... 

Merge "SurfaceFlinger: do not assert if setActiveConfigWithConstraints fails" into rvc-dev am: abb891a7

Change-Id: I2119947532d949c6ce02a43758d57f74967f4ec7
parents 017f8fc2 abb891a7

services/surfaceflinger/SurfaceFlinger.cpp

+3 −1
Original line number Diff line number Diff line
@@ -1074,7 +1074,9 @@ bool SurfaceFlinger::performSetActiveConfig() { 
                                                           mUpcomingActiveConfig.configId.value(),

                                                           constraints, &outTimeline);

    if (status != NO_ERROR) {

        LOG_ALWAYS_FATAL("setActiveConfigWithConstraints failed: %d", status);

        // setActiveConfigWithConstraints may fail if a hotplug event is just about

        // to be sent. We just log the error in this case.

        ALOGW("setActiveConfigWithConstraints failed: %d", status);

        return false;

    }