Merge "resolve merge conflicts of be23ef368f to oc-dev-plus-aosp" into oc-dev-plus-aosp

2017-06-06 22:53:00 +00:00
parent 6cae189d26 794bcd27ef
commit 9dd289529d
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();
    }