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

Commit 773c9b7b authored by Chia-I Wu's avatar Chia-I Wu Committed by android-build-merger
Browse files

Merge "surfaceflinger: fix a nullptr dereference" into oc-dev 

am: 29e5fa3f

Change-Id: If73de4c0280bcbda08046dc658612be90d1ed417
parents a32882d0 29e5fa3f

services/surfaceflinger/Layer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2682,7 +2682,7 @@ Transform Layer::getTransform() const { 
        // for in the transform. We need to mirror this scaling in child surfaces

        // or we will break the contract where WM can treat child surfaces as

        // pixels in the parent surface.

        if (p->isFixedSize()) {

        if (p->isFixedSize() && p->mActiveBuffer != nullptr) {

            int bufferWidth;

            int bufferHeight;

            if ((p->mCurrentTransform & NATIVE_WINDOW_TRANSFORM_ROT_90) == 0) {