Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make testSplitscreenPortraitAppOrientationRequests pass to unblock release

Browse Source 
am: cf2d6475f9

Change-Id: Ie0862784fd537c0a669d3085b2d86a7ab482db7f
This commit is contained in:
Wale Ogunwale
2018-06-14 15:15:35 -07:00
committed by android-build-merger
parent 62f380c409 cf2d6475f9
commit 2dfb03f6f4
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/wm/DisplayContent.java
View File

@@ -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;