From 9425839379d862604d4b5a7b9161540f598f64f6 Mon Sep 17 00:00:00 2001
From: Jason Monk <jmonk@google.com>
Date: Tue, 8 Mar 2016 13:05:31 -0500
Subject: [PATCH] Fix SummaryLoader lifecycle second and for all

Mostly hypothetical fix for weird circumstance where listening
lifecycle gets broken.  To fix this, track the current state
of listening in the SummaryLoader and force it into the non-listening
state when released.

Bug: 26027137
Bug: 26731143
Change-Id: I7299749230924eafa3e6e7d5b0de6e48ff014a38
---
 .../settings/dashboard/SummaryLoader.java     | 35 ++++++++++++++-----
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/com/android/settings/dashboard/SummaryLoader.java b/src/com/android/settings/dashboard/SummaryLoader.java
index 5019844c7a9..e6c124376b9 100644
--- a/src/com/android/settings/dashboard/SummaryLoader.java
+++ b/src/com/android/settings/dashboard/SummaryLoader.java
@@ -46,6 +46,7 @@ public class SummaryLoader {
     private final HandlerThread mWorkerThread;
 
     private DashboardAdapter mAdapter;
+    private boolean mListening;
 
     public SummaryLoader(Activity activity, List<DashboardCategory> categories) {
         mHandler = new Handler();
@@ -64,6 +65,8 @@ public class SummaryLoader {
 
     public void release() {
         mWorkerThread.quitSafely();
+        // Make sure we aren't listening.
+        setListeningW(false);
     }
 
     public void setAdapter(DashboardAdapter adapter) {
@@ -122,6 +125,27 @@ public class SummaryLoader {
         return tile.metaData;
     }
 
+    private synchronized void setListeningW(boolean listening) {
+        if (mListening == listening) return;
+        if (DEBUG) Log.d(TAG, "Listening " + listening);
+        for (SummaryProvider p : mSummaryMap.keySet()) {
+            p.setListening(listening);
+        }
+        mListening = listening;
+    }
+
+    private synchronized void makeProviderW(Tile tile) {
+        SummaryProvider provider = getSummaryProvider(tile);
+        if (provider != null) {
+            if (DEBUG) Log.d(TAG, "Creating " + tile);
+            mSummaryMap.put(provider, tile);
+            if (mListening) {
+                // If we are somehow already listening, put the provider in that state.
+                provider.setListening(true);
+            }
+        }
+    }
+
     public interface SummaryProvider {
         void setListening(boolean listening);
     }
@@ -143,18 +167,11 @@ public class SummaryLoader {
             switch (msg.what) {
                 case MSG_GET_PROVIDER:
                     Tile tile = (Tile) msg.obj;
-                    SummaryProvider provider = getSummaryProvider(tile);
-                    if (provider != null) {
-                        if (DEBUG) Log.d(TAG, "Creating " + tile);
-                        mSummaryMap.put(provider, tile);
-                    }
+                    makeProviderW(tile);
                     break;
                 case MSG_SET_LISTENING:
                     boolean listening = msg.arg1 != 0;
-                    if (DEBUG) Log.d(TAG, "Listening " + listening);
-                    for (SummaryProvider p : mSummaryMap.keySet()) {
-                        p.setListening(listening);
-                    }
+                    setListeningW(listening);
                     break;
             }
         }