From b540088deafb179cfc42f11603f86016e4c5123d Mon Sep 17 00:00:00 2001
From: Fabian Kozynski <kozynski@google.com>
Date: Wed, 27 May 2020 09:45:28 -0400
Subject: [PATCH] Fix the Lifecycle states.

Setting current state to DESTROYED effectively removes listeners. Change
to CREATED, which is equivalent to moving through onPause and onStop,
temporarily interrupting listening.

Fixes: 157437903
Test: manual, toggle ringer while QS is open
Change-Id: I7d5fd575795b51c0990374ab58abe9e6cd13718c
---
 .../android/systemui/globalactions/GlobalActionsDialog.java   | 2 +-
 .../src/com/android/systemui/qs/QuickStatusBarHeader.java     | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
index 61c9a967cc4c3..9908dd29cf432 100644
--- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
+++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
@@ -1173,7 +1173,7 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
         }
         mUiEventLogger.log(GlobalActionsEvent.GA_POWER_MENU_CLOSE);
         mWindowManagerFuncs.onGlobalActionsHidden();
-        mLifecycle.setCurrentState(Lifecycle.State.DESTROYED);
+        mLifecycle.setCurrentState(Lifecycle.State.CREATED);
     }
 
     /**
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
index 3b2bea8f80f26..29b3436c0b722 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
@@ -17,7 +17,6 @@ package com.android.systemui.qs;
 import static android.app.StatusBarManager.DISABLE2_QUICK_SETTINGS;
 
 import static com.android.systemui.util.InjectionInflationController.VIEW_CONTEXT;
-import static com.android.systemui.util.Utils.useQsMediaPlayer;
 
 import android.annotation.ColorInt;
 import android.app.ActivityManager;
@@ -42,7 +41,6 @@ import android.view.ContextThemeWrapper;
 import android.view.DisplayCutout;
 import android.view.View;
 import android.view.WindowInsets;
-import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
@@ -477,7 +475,7 @@ public class QuickStatusBarHeader extends RelativeLayout implements
         } else {
             mZenController.removeCallback(this);
             mAlarmController.removeCallback(this);
-            mLifecycle.setCurrentState(Lifecycle.State.DESTROYED);
+            mLifecycle.setCurrentState(Lifecycle.State.CREATED);
         }
     }