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

Commit 1c479ea1 authored by Mark Renouf's avatar Mark Renouf Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Ifa6a92cb60683f42afb541a977d255adacf029f7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f167b6fe faf0b610

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.");