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

Commit 9243c105 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [12952231, 12952640, 12952469, 12952586, 12952232,... 

Merge cherrypicks of [12952231, 12952640, 12952469, 12952586, 12952232, 12952587, 12952588, 12952589, 12952107, 12952470, 12952641] into rvc-qpr1-release

Change-Id: I8e259c5da4a4241f8e80d5504963fad4a701e243
parents 0d311974 4ac93923

services/surfaceflinger/SurfaceFlinger.cpp

+5 −0
Original line number Diff line number Diff line
@@ -6227,6 +6227,11 @@ status_t SurfaceFlinger::setFrameRate(const sp<IGraphicBufferProducer>& surface, 
        Mutex::Autolock lock(mStateLock);

        if (authenticateSurfaceTextureLocked(surface)) {

            sp<Layer> layer = (static_cast<MonitoredProducer*>(surface.get()))->getLayer();

            if (layer == nullptr) {

                ALOGE("Attempt to set frame rate on a layer that no longer exists");

                return BAD_VALUE;

            }



            if (layer->setFrameRate(

                        Layer::FrameRate(frameRate,

                                         Layer::FrameRate::convertCompatibility(compatibility)))) {