Merge "Only apply server visible to split screen" into rvc-dev am: 71f139471c am: 8f1ea18922

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

Change-Id: If30e4b4872a51da7fdffb807350b438d54695172

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

@@ -351,9 +351,13 @@ class InsetsSourceProvider {
     }
 
     private void updateVisibility() {
+        // TODO(b/159699383): remove the client controlled check when the insets visibility can be
+        //                    driven by the system UI.
         final boolean isClientControlled = mControlTarget != null
                 && mControlTarget.isClientControlled();
-        mSource.setVisible(mServerVisible && (!isClientControlled || mClientVisible));
+        mSource.setVisible(mServerVisible
+                && ((!isClientControlled && mDisplayContent.inMultiWindowMode())
+                    || mClientVisible));
         ProtoLog.d(WM_DEBUG_IME,
                 "InsetsSource updateVisibility serverVisible: %s clientVisible: %s",
                 mServerVisible, mClientVisible);