From a7dfd43ec25077dd23bb67e4776229fc1f27d43e Mon Sep 17 00:00:00 2001
From: Jorim Jaggi <jjaggi@google.com>
Date: Wed, 24 Jun 2020 20:48:06 +0000
Subject: [PATCH] Revert "Only apply server visible to split screen"

This reverts commit 32027abac9089dce70381953a6ba48d2e702d72a.

Reason for revert: Breaks bubbles :-(

Bug: 158447971
Bug: 159808754
Change-Id: I82c316b4ebb420a3b34a7f68c6a47205c4c22d06
---
 .../java/com/android/server/wm/InsetsSourceProvider.java    | 6 +-----
 1 file changed, 1 insertion(+), 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 1762b62299904..c8d9fe0f0a659 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);