From cb92ae1096ebb8a5251245dd771bc03c44ee88d9 Mon Sep 17 00:00:00 2001
From: Candice Lo <chihtinglo@google.com>
Date: Tue, 16 May 2023 03:36:00 +0000
Subject: [PATCH] Cleaning up tooltip for
 AccessibilityQuickSettingsPrimarySwitchPreferenceController

Cleaning up QS tile tooltip in the Settings page in onDestroy to avoid
leaking the window.

Bug: 279547549
Test: manually check only one tooltip exists
Change-Id: I13e94ce549e19fd54c9034f3b3372ecf40388e39
---
 ...ibilityQuickSettingsPrimarySwitchPreferenceController.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/com/android/settings/accessibility/AccessibilityQuickSettingsPrimarySwitchPreferenceController.java b/src/com/android/settings/accessibility/AccessibilityQuickSettingsPrimarySwitchPreferenceController.java
index 9681a42ad0a..47073638122 100644
--- a/src/com/android/settings/accessibility/AccessibilityQuickSettingsPrimarySwitchPreferenceController.java
+++ b/src/com/android/settings/accessibility/AccessibilityQuickSettingsPrimarySwitchPreferenceController.java
@@ -66,6 +66,10 @@ public abstract class AccessibilityQuickSettingsPrimarySwitchPreferenceControlle
     @Override
     public void onDestroy() {
         mHandler.removeCallbacksAndMessages(null);
+        final boolean isTooltipWindowShowing = mTooltipWindow != null && mTooltipWindow.isShowing();
+        if (isTooltipWindowShowing) {
+            mTooltipWindow.dismiss();
+        }
     }
 
     @Override