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

2022-07-06 20:10:15 +00:00
parent ef6b610b10 a433556fc0
commit faf0b610d3
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/view/ScrollCaptureConnection.java
+++ b/core/java/android/view/ScrollCaptureConnection.java
@@ -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.");