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

Commit f761cb81 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 am: c7b2ea04 am: 4423c70a am: 71f3afdc

Change-Id: If227882d3fea38ec641af09039c2573f3451e00c
parents bbad89f2 71f3afdc

services/surfaceflinger/SurfaceFlinger.cpp

+3 −1
Original line number Diff line number Diff line
@@ -1078,7 +1078,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;

    }