From a51adc9ca7e4b3787766f3d1517a6d5ae76a1150 Mon Sep 17 00:00:00 2001 From: Kevin Chyn Date: Wed, 14 Jun 2023 20:13:05 +0000 Subject: [PATCH] Move local variable to more localized scope Bug: 281952366 Test: Presubmit Change-Id: I14cc41cda9e05d39d844d1e8efcdfc9012c8efcb --- .../window/extensions/area/WindowAreaComponentImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/area/WindowAreaComponentImpl.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/area/WindowAreaComponentImpl.java index f9aa1bd98e387..1e6e50359cf3c 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/area/WindowAreaComponentImpl.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/area/WindowAreaComponentImpl.java @@ -239,7 +239,7 @@ public class WindowAreaComponentImpl implements WindowAreaComponent, // display state, so we have to look through all displays to match the address final Display[] displays = mDisplayManager.getDisplays( DisplayManager.DISPLAY_CATEGORY_ALL_INCLUDING_DISABLED); - final Display defaultDisplay = mDisplayManager.getDisplay(Display.DEFAULT_DISPLAY); + for (int i = 0; i < displays.length; i++) { DisplayAddress.Physical address = @@ -255,6 +255,8 @@ public class WindowAreaComponentImpl implements WindowAreaComponent, // TODO(b/287170025): This should be something like if (!rearDisplay.isEnabled) // instead. Currently when the rear display is disabled, its state is STATE_OFF. if (rearDisplay.getDisplayId() != Display.DEFAULT_DISPLAY) { + final Display defaultDisplay = mDisplayManager + .getDisplay(Display.DEFAULT_DISPLAY); rotateRearDisplayMetricsIfNeeded(defaultDisplay.getRotation(), rearDisplay.getRotation(), rearDisplayMetrics); }