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

Commit 5f7e307b authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Remove invocation of closeTransaction while using a11y service"... 

Merge "Merge "Remove invocation of closeTransaction while using a11y service" into rvc-dev am: c57159c7 am: a4ab7807" into rvc-d1-dev-plus-aosp am: 8d974be1

Change-Id: I0332ddcd9a1d1a12133ec86fdc62a2bd57b6a105
parents f48f7ab1 8d974be1

services/core/java/com/android/server/wm/WindowManagerService.java

+2 −9
Original line number Diff line number Diff line
@@ -7650,15 +7650,8 @@ public class WindowManagerService extends IWindowManager.Stub 
                    Slog.w(TAG, "Cannot find window which accessibility connection is added to");

                    return;

                }

                try (SurfaceControl.Transaction t = new SurfaceControl.Transaction()) {

                    t.setMetadata(

                            state.mSurfaceControl,

                            SurfaceControl.METADATA_ACCESSIBILITY_ID,

                            accessibilityWindowId);

                    t.apply();

                } finally {

                    SurfaceControl.closeTransaction();

                }

                mTransaction.setMetadata(state.mSurfaceControl,

                        SurfaceControl.METADATA_ACCESSIBILITY_ID, accessibilityWindowId).apply();

            }

        }