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

Commit 79b87fa1 authored by Ying Wei's avatar Ying Wei Committed by Automerger Merge Worker
Browse files

Grab lock before reparenting in SurfaceFlinger commitMirrorDisplays() am: 2cf827fa 

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



Change-Id: If853c31e00d8644fcae2fbf32fe3a1a6a84af486
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f3dc8816 2cf827fa

services/surfaceflinger/SurfaceFlinger.cpp

+8 −3
Original line number Diff line number Diff line
@@ -7913,10 +7913,15 @@ bool SurfaceFlinger::commitMirrorDisplays(VsyncId vsyncId) { 
                                         ISurfaceComposerClient::eNoColorFill,

                                         gui::LayerMetadata());

            sp<Layer> childMirror;

            {

                Mutex::Autolock lock(mStateLock);

                createEffectLayer(mirrorArgs, &unused, &childMirror);

                childMirror->setClonedChild(layer->createClone());

                childMirror->reparent(mirrorDisplay.rootHandle);

            }

            // lock on mStateLock needs to be released before binder handle gets destroyed

            unused.clear();

        }

    }

    return true;

}