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

Commit 789d6ecd authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

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

Merge "Remove invocation of closeTransaction while using a11y service" into rvc-dev am: c57159c7 am: a4ab7807

Change-Id: I177801018c08db9992c4c366ba8aaad080895ec1
parents 721f42ef a4ab7807

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();

            }

        }