Revert "HeadsUp: Only remove heads up if attached to window"

This reverts commit e149e4f.

Author: codex-corp

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

@@ -1587,10 +1587,6 @@ private WindowManager.LayoutParams getNavigationBarLayoutParams() {
     }
 
     private void addHeadsUpView() {
-        if (mHeadsUpNotificationView != null && mHeadsUpNotificationView.isAttachedToWindow()) {
-            return;
-        }
-
         WindowManager.LayoutParams lp = new WindowManager.LayoutParams(
                 LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT,
                 WindowManager.LayoutParams.TYPE_STATUS_BAR_PANEL, // above the status bar!
@@ -1614,9 +1610,7 @@ private void addHeadsUpView() {
     }
 
     private void removeHeadsUpView() {
-        if (mHeadsUpNotificationView != null && mHeadsUpNotificationView.isAttachedToWindow()) {
-            mWindowManager.removeView(mHeadsUpNotificationView);
-        }
+        mWindowManager.removeView(mHeadsUpNotificationView);
     }
 
     public void refreshAllStatusBarIcons() {
@@ -3908,12 +3902,10 @@ private void resetUserSetupObserver() {
     private void setHeadsUpVisibility(boolean vis) {
         if (!ENABLE_HEADS_UP) return;
         if (DEBUG) Log.v(TAG, (vis ? "showing" : "hiding") + " heads up window");
-        if (mHeadsUpNotificationView != null && mHeadsUpNotificationView.isAttachedToWindow()) {
-            mHeadsUpNotificationView.setVisibility(vis ? View.VISIBLE : View.GONE);
-            if (!vis) {
-                if (DEBUG) Log.d(TAG, "setting heads up entry to null");
-                mInterruptingNotificationEntry = null;
-            }
+        mHeadsUpNotificationView.setVisibility(vis ? View.VISIBLE : View.GONE);
+        if (!vis) {
+            if (DEBUG) Log.d(TAG, "setting heads up entry to null");
+            mInterruptingNotificationEntry = null;
         }
     }
 
@@ -3954,6 +3946,10 @@ private static void copyNotifications(ArrayList<Pair<IBinder, StatusBarNotificat
 
     private void recreateStatusBar() {
         mRecreating = true;
+        if (mHeadsUpNotificationView != null) {
+            removeHeadsUpView();
+            mHeadsUpNotificationView = null;
+        }
 
         synchronized(mLock){
             while (mTickerInProgress){
@@ -3964,7 +3960,6 @@ private void recreateStatusBar() {
                 }
             }
         }
-        removeHeadsUpView();
         mStatusBarContainer.removeAllViews();
         mStatusBarContainer.clearDisappearingChildren();