Merge "Fix summary lifecycle" into nyc-dev am: 6e51591 am: db723c9

am: 9574c90

* commit '9574c9091bd182f4e89d9c725c6f0702968db803':
  Fix summary lifecycle

Change-Id: I82265dbc34460733cbfcd1c32d02c88d6037ae7c

src/com/android/settings/dashboard/SummaryLoader.java

@@ -51,6 +51,7 @@ public class SummaryLoader {
 
     private DashboardAdapter mAdapter;
     private boolean mListening;
+    private boolean mWorkerListening;
     private ArrayList<BroadcastReceiver> mReceivers = new ArrayList<>();
 
     public SummaryLoader(Activity activity, List<DashboardCategory> categories) {
@@ -105,6 +106,7 @@ public class SummaryLoader {
             mActivity.unregisterReceiver(mReceivers.get(i));
         }
         mReceivers.clear();
+        mWorker.removeMessages(Worker.MSG_SET_LISTENING);
         mWorker.obtainMessage(Worker.MSG_SET_LISTENING, listening ? 1 : 0, 0).sendToTarget();
     }
 
@@ -164,6 +166,8 @@ public class SummaryLoader {
     }
 
     private synchronized void setListeningW(boolean listening) {
+        if (mWorkerListening == listening) return;
+        mWorkerListening = listening;
         if (DEBUG) Log.d(TAG, "Listening " + listening);
         for (SummaryProvider p : mSummaryMap.keySet()) {
             try {