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

Commit ee531d2c authored by Arthur Hung's avatar Arthur Hung Committed by Automerger Merge Worker
Browse files

Merge "Update transform hint from relayout window (2/2)" into sc-dev am: 4aa92815 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/14913675

Change-Id: Ib2be7edb4ae788e6770976fbb7715b84719e2775
parents d63ae892 4aa92815

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/SurfaceFlinger.cpp

+5 −1
Original line number Diff line number Diff line
@@ -2860,8 +2860,10 @@ void SurfaceFlinger::processDisplayChanged(const wp<IBinder>& displayToken, 
            (currentState.orientedDisplaySpaceRect != drawingState.orientedDisplaySpaceRect)) {

            display->setProjection(currentState.orientation, currentState.layerStackSpaceRect,

                                   currentState.orientedDisplaySpaceRect);

            if (display->isPrimary()) {

                mDefaultDisplayTransformHint = display->getTransformHint();

            }

        }

        if (currentState.width != drawingState.width ||

            currentState.height != drawingState.height) {

            display->setDisplaySize(currentState.width, currentState.height);
@@ -6932,6 +6934,8 @@ sp<Layer> SurfaceFlinger::handleLayerCreatedLocked(const sp<IBinder>& handle, bo 
        parent->addChild(layer);

    }



    layer->updateTransformHint(mDefaultDisplayTransformHint);



    if (state->initialProducer != nullptr) {

        mGraphicBufferProducerList.insert(state->initialProducer);

        LOG_ALWAYS_FATAL_IF(mGraphicBufferProducerList.size() > mMaxGraphicBufferProducerListSize,