From 25e64aedef0d4d6d61a1af00490545bfb01c6dba Mon Sep 17 00:00:00 2001 From: Oleg Blinnikov Date: Tue, 21 Mar 2023 18:27:15 +0000 Subject: [PATCH] Copy WindowState Bounds before modifying them It is not safe to modify bounds returned by getBounds, so it is important to copy them. Change-Id: Ic19ed5e0326dc427fc6e38695fc5760980315599 Bug: 273045619 Test: build passes Merged-In: I625afa17711fcd52bbb7fe9a9ba51500eb1bef5c --- .../com/android/server/wm/AccessibilityWindowsPopulator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/wm/AccessibilityWindowsPopulator.java b/services/core/java/com/android/server/wm/AccessibilityWindowsPopulator.java index 4b8a5b7fcf56e..26f781f620789 100644 --- a/services/core/java/com/android/server/wm/AccessibilityWindowsPopulator.java +++ b/services/core/java/com/android/server/wm/AccessibilityWindowsPopulator.java @@ -861,7 +861,7 @@ public final class AccessibilityWindowsPopulator extends WindowInfosListener { private static void getLetterBoxBounds(WindowState windowState, Region outRegion) { final Rect letterboxInsets = windowState.mActivityRecord.getLetterboxInsets(); - final Rect nonLetterboxRect = windowState.getBounds(); + final Rect nonLetterboxRect = new Rect(windowState.getBounds()); nonLetterboxRect.inset(letterboxInsets); outRegion.set(windowState.getBounds());