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

Commit 95b1139d authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Fix crash due to race on close()" into tm-qpr-dev am: faf0b610 am: 1c479ea1"

parents 6bf28094 46994bf4

core/java/android/view/ScrollCaptureConnection.java

+1 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ public class ScrollCaptureConnection extends IScrollCaptureConnection.Stub imple 


    @BinderThread

    @Override

    public void close() {

    public synchronized void close() {

        Trace.instantForTrack(TRACE_TAG_GRAPHICS, TRACE_TRACK, "close");

        if (mActive) {

            Log.w(TAG, "close(): capture session still active! Ending now.");