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 
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...

Bug: 110159357
Test: atest ActivityManagerAppConfigurationTests#testSplitscreenPortraitAppOrientationRequests
Change-Id: I69423eef3661133b2a032a166745157b3e344751
This commit is contained in:
Wale Ogunwale
2018-06-14 08:55:42 -07:00
parent f910fdb1da
commit cf2d6475f9
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 or freeform stack is visible...except for the home stack/task if the
// docked stack is minimized and it actually set something. // docked stack is minimized and it actually set something.
if (mHomeStack != null && mHomeStack.isVisible() 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(); final int orientation = mHomeStack.getOrientation();
if (orientation != SCREEN_ORIENTATION_UNSET) { if (orientation != SCREEN_ORIENTATION_UNSET) {
return orientation; return orientation;