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

Commit b812df51 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 7482982 from 757f24e3 to sc-d1-release 

Change-Id: I0bf6e5a9d5a7d4ca37af9e1d2741f523b16d4290
parents 0dac1caf 757f24e3

libs/gui/BLASTBufferQueue.cpp

+5 −0
Original line number Diff line number Diff line
@@ -205,6 +205,11 @@ void BLASTBufferQueue::update(const sp<SurfaceControl>& surface, uint32_t width, 
        applyTransaction = true;

    }



    if (mSurfaceControl != nullptr) {

        mTransformHint = mSurfaceControl->getTransformHint();

        mBufferItemConsumer->setTransformHint(mTransformHint);

    }



    ui::Size newSize(width, height);

    if (mRequestedSize != newSize) {

        mRequestedSize.set(newSize);

services/surfaceflinger/BufferStateLayer.cpp

+7 −1
Original line number Diff line number Diff line
@@ -540,10 +540,16 @@ bool BufferStateLayer::setApi(int32_t api) { 


bool BufferStateLayer::setSidebandStream(const sp<NativeHandle>& sidebandStream) {

    if (mDrawingState.sidebandStream == sidebandStream) return false;



    if (mDrawingState.sidebandStream != nullptr && sidebandStream == nullptr) {

        mFlinger->mTunnelModeEnabledReporter->decrementTunnelModeCount();

    } else if (sidebandStream != nullptr) {

        mFlinger->mTunnelModeEnabledReporter->incrementTunnelModeCount();

    }



    mDrawingState.sidebandStream = sidebandStream;

    mDrawingState.modified = true;

    setTransactionFlags(eTransactionNeeded);



    if (!mSidebandStreamChanged.exchange(true)) {

        // mSidebandStreamChanged was false

        mFlinger->signalLayerUpdate();

services/surfaceflinger/Layer.cpp

+10 −6
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ 
#include "MonitoredProducer.h"

#include "SurfaceFlinger.h"

#include "TimeStats/TimeStats.h"

#include "TunnelModeEnabledReporter.h"

#include "input/InputWindow.h"



#define DEBUG_RESIZE 0
@@ -172,6 +173,10 @@ Layer::~Layer() { 


    mFrameTracker.logAndResetStats(mName);

    mFlinger->onLayerDestroyed(this);



    if (mDrawingState.sidebandStream != nullptr) {

        mFlinger->mTunnelModeEnabledReporter->decrementTunnelModeCount();

    }

}



LayerCreationArgs::LayerCreationArgs(SurfaceFlinger* flinger, sp<Client> client, std::string name,
@@ -700,11 +705,6 @@ uint32_t Layer::doTransaction(uint32_t flags) { 
        mNeedsFiltering = getActiveTransform(s).needsBilinearFiltering();

    }



    if (mDrawingState.inputInfoChanged) {

        flags |= eInputInfoChanged;

        mDrawingState.inputInfoChanged = false;

    }



    commitTransaction(mDrawingState);



    return flags;
@@ -777,6 +777,8 @@ bool Layer::setLayer(int32_t z) { 
    mDrawingState.z = z;

    mDrawingState.modified = true;



    mFlinger->mSomeChildrenChanged = true;



    // Discard all relative layering.

    if (mDrawingState.zOrderRelativeOf != nullptr) {

        sp<Layer> strongRelative = mDrawingState.zOrderRelativeOf.promote();
@@ -827,6 +829,8 @@ bool Layer::setRelativeLayer(const sp<IBinder>& relativeToHandle, int32_t relati 
        return false;

    }



    mFlinger->mSomeChildrenChanged = true;



    mDrawingState.sequence++;

    mDrawingState.modified = true;

    mDrawingState.z = relativeZ;
@@ -1986,7 +1990,7 @@ void Layer::setInputInfo(const InputWindowInfo& info) { 
    mDrawingState.inputInfo = info;

    mDrawingState.touchableRegionCrop = extractLayerFromBinder(info.touchableRegionCropHandle);

    mDrawingState.modified = true;

    mDrawingState.inputInfoChanged = true;

    mFlinger->mInputInfoChanged = true;

    setTransactionFlags(eTransactionNeeded);

}

services/surfaceflinger/Layer.h

+0 −1
Original line number Diff line number Diff line
@@ -186,7 +186,6 @@ public: 
        float cornerRadius;

        int backgroundBlurRadius;



        bool inputInfoChanged;

        InputWindowInfo inputInfo;

        wp<Layer> touchableRegionCrop;

services/surfaceflinger/MonitoredProducer.cpp

+5 −0
Original line number Diff line number Diff line
@@ -140,6 +140,11 @@ status_t MonitoredProducer::getLastQueuedBuffer(sp<GraphicBuffer>* outBuffer, 
            outTransformMatrix);

}



status_t MonitoredProducer::getLastQueuedBuffer(sp<GraphicBuffer>* outBuffer, sp<Fence>* outFence,

                                                Rect* outRect, uint32_t* outTransform) {

    return mProducer->getLastQueuedBuffer(outBuffer, outFence, outRect, outTransform);

}



void MonitoredProducer::getFrameTimestamps(FrameEventHistoryDelta* outDelta) {

    mProducer->getFrameTimestamps(outDelta);

}