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

Change-Id: I177801018c08db9992c4c366ba8aaad080895ec1
2020-04-22 08:43:25 +00:00
parent 721f42efef a4ab780728
commit 789d6ecdc4
1 changed files with 2 additions and 9 deletions
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -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();
            }
        }