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

Commit 8aee36b0 authored by Xin Li's avatar Xin Li
Browse files

DO NOT MERGE - Merge RQ1A.201205.011 

Bug: 172690556
Merged-In: Ice1edd7c5320f4d1d915643e30430919de258dbc
Change-Id: Ieaedbe45a0a7bae6579eb1f40bf497889ada405f
parents 62cb684c 9243c105

services/surfaceflinger/SurfaceFlinger.cpp

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

        Mutex::Autolock lock(mStateLock);

        if (authenticateSurfaceTextureLocked(surface)) {

        if (authenticateSurfaceTextureLocked(surface)) {

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

            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(

            if (layer->setFrameRate(

                        Layer::FrameRate(frameRate,

                        Layer::FrameRate(frameRate,

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

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