resolve merge conflicts of be23ef368f to oc-dev-plus-aosp

Test: I solemnly swear I tested this conflict resolution. Change-Id: I5364727a21f62fc479c9bca6ad7ab2c3b62d1d1b
2017-06-06 16:38:00 -04:00
parent 1e61697d3c be23ef368f
commit 794bcd27ef
1 changed files with 3 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileImpl.java
@@ -317,7 +317,9 @@ public abstract class QSTileImpl<TState extends State> implements QSTile {
    protected abstract void setListening(boolean listening);

    protected void handleDestroy() {
-        setListening(false);
+        if (mListeners.size() != 0) {
+            setListening(false);
+        }
        mCallbacks.clear();
    }