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

Commit 2dfb03f6 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by android-build-merger
Browse files

Make testSplitscreenPortraitAppOrientationRequests pass to unblock release 

am: cf2d6475

Change-Id: Ie0862784fd537c0a669d3085b2d86a7ab482db7f
parents 62f380c4 cf2d6475

services/core/java/com/android/server/wm/DisplayContent.java

+8 −1
Original line number Diff line number Diff line
@@ -3538,7 +3538,14 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo 
                // docked or freeform stack is visible...except for the home stack/task if the

                // docked stack is minimized and it actually set something.

                if (mHomeStack != null && mHomeStack.isVisible()

                        && mDividerControllerLocked.isMinimizedDock()) {

                        && mDividerControllerLocked.isMinimizedDock()

                        // TODO(b/110159357): Work around to unblock the release for failing test

                        // ActivityManagerAppConfigurationTests#testSplitscreenPortraitAppOrientationRequests

                        // which shouldn't be failing since home stack shouldn't be visible. We need

                        // to dig deeper to see why it is failing. NOTE: Not failing on current

                        // master...

                        && !(mDividerControllerLocked.isHomeStackResizable()

                            && mHomeStack.matchParentBounds())) {

                    final int orientation = mHomeStack.getOrientation();

                    if (orientation != SCREEN_ORIENTATION_UNSET) {

                        return orientation;