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

Commit 6da0d7ad authored by Kevin Chyn's avatar Kevin Chyn Committed by Automerger Merge Worker
Browse files

Merge "Move local variable to more localized scope" into udc-dev am: 1f61ce84 am: 770e9d7e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23696853



Change-Id: I372826b216e571e1015ea5b3877ce29a3c33b81e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents adbaa679 770e9d7e

libs/WindowManager/Jetpack/src/androidx/window/extensions/area/WindowAreaComponentImpl.java

+3 −1
Original line number Diff line number Diff line
@@ -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);

                }