Merge "Revert "Only apply server visible to split screen"" into rvc-dev

1 files changed, 1 insertions, 5 deletions

diff --git a/services/core/java/com/android/server/wm/InsetsSourceProvider.java b/services/core/java/com/android/server/wm/InsetsSourceProvider.java
index 1762b6229990..c8d9fe0f0a65 100644
--- a/services/core/java/com/android/server/wm/InsetsSourceProvider.java
+++ b/services/core/java/com/android/server/wm/InsetsSourceProvider.java
@@ -351,13 +351,9 @@ 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 && mDisplayContent.inMultiWindowMode())
-                    || mClientVisible));
+        mSource.setVisible(mServerVisible && (!isClientControlled || mClientVisible));
         ProtoLog.d(WM_DEBUG_IME,
                 "InsetsSource updateVisibility serverVisible: %s clientVisible: %s",
                 mServerVisible, mClientVisible);