Merge "Fix not updating split bounds after devices unfolded" into sc-v2-dev am: 11a26a5665 am: cd672f385e

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

Change-Id: I75e5beda71865a4a2bfcac323268a7ff027a22e2

libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java

@@ -172,13 +172,12 @@ public final class SplitLayout {
             affectsLayout = true;
         }
 
-        if (mInitialized && affectsLayout) {
+        if (mInitialized) {
             release();
             init();
-            return true;
         }
 
-        return false;
+        return affectsLayout;
     }
 
     /** Updates recording bounds of divider window and both of the splits. */

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java

@@ -602,7 +602,8 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler,
     public void onDisplayAreaInfoChanged(DisplayAreaInfo displayAreaInfo) {
         mDisplayAreaInfo = displayAreaInfo;
         if (mSplitLayout != null
-                && mSplitLayout.updateConfiguration(mDisplayAreaInfo.configuration)) {
+                && mSplitLayout.updateConfiguration(mDisplayAreaInfo.configuration)
+                && mMainStage.isActive()) {
             onBoundsChanged(mSplitLayout);
         }
     }

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/split/SplitLayoutTests.java

@@ -72,7 +72,6 @@ public class SplitLayoutTests extends ShellTestCase {
     @UiThreadTest
     public void testUpdateConfiguration() {
         final Configuration config = getConfiguration();
-        mSplitLayout.init();
 
         // Verify it returns true if new config won't affect split layout.
         assertThat(mSplitLayout.updateConfiguration(config)).isFalse();