From 6feb3a1c87d1ec63523421d6e03c6a9ff0a8851b Mon Sep 17 00:00:00 2001
From: Gabriele M <moto.falcon.git@gmail.com>
Date: Mon, 5 Jun 2017 17:55:03 +0200
Subject: [PATCH] QS: Remove listeners only if added

handleDestroy() calls setListening(false) unconditionally. This
causes an error if no listener was never added. Check if we added
a listener and then try to remove it.

Change-Id: Iefe8aacbe87ba1c2c19c9e77cf132fc7c84798f9
---
 packages/SystemUI/src/com/android/systemui/qs/QSTile.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSTile.java b/packages/SystemUI/src/com/android/systemui/qs/QSTile.java
index f743a4bf1a825..dbe2b2ec8b798 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSTile.java
@@ -312,7 +312,9 @@ public abstract class QSTile<TState extends State> {
     protected abstract void setListening(boolean listening);
 
     protected void handleDestroy() {
-        setListening(false);
+        if (mListeners.size() != 0) {
+            setListening(false);
+        }
         mCallbacks.clear();
     }