PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Try to fix receiver crash" into nyc-dev

Browse Source
This commit is contained in:
Jason Monk
2016-05-03 18:37:23 +00:00
committed by Android (Google) Code Review
parent 12c2c2538b a8a029f8eb
commit 5a2d6800b6
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/dashboard/SummaryLoader.java
View File

@@ -26,6 +26,7 @@ import android.os.Looper;
import android.os.Message; import android.os.Message;
import android.os.Process; import android.os.Process;
import android.util.ArrayMap; import android.util.ArrayMap;
import android.util.ArraySet;
import android.util.Log; import android.util.Log;
import com.android.settings.SettingsActivity; import com.android.settings.SettingsActivity;
import com.android.settingslib.drawer.DashboardCategory; import com.android.settingslib.drawer.DashboardCategory;
@@ -52,7 +53,7 @@ public class SummaryLoader {
private DashboardAdapter mAdapter; private DashboardAdapter mAdapter;
private boolean mListening; private boolean mListening;
private boolean mWorkerListening; private boolean mWorkerListening;
private ArrayList<BroadcastReceiver> mReceivers = new ArrayList<>(); private ArraySet<BroadcastReceiver> mReceivers = new ArraySet<>();
public SummaryLoader(Activity activity, List<DashboardCategory> categories) { public SummaryLoader(Activity activity, List<DashboardCategory> categories) {
mHandler = new Handler(); mHandler = new Handler();
@@ -103,7 +104,7 @@ public class SummaryLoader {
mListening = listening; mListening = listening;
// Unregister listeners immediately. // Unregister listeners immediately.
for (int i = 0; i < mReceivers.size(); i++) { for (int i = 0; i < mReceivers.size(); i++) {
mActivity.unregisterReceiver(mReceivers.get(i)); mActivity.unregisterReceiver(mReceivers.valueAt(i));
} }
mReceivers.clear(); mReceivers.clear();
mWorker.removeMessages(Worker.MSG_SET_LISTENING); mWorker.removeMessages(Worker.MSG_SET_LISTENING);