Merge "Guard against crashes from data saver listeners" into nyc-dev

am: 557c716

* commit '557c716a3aa3b146c4a2fa4a68860377d435b233':
  Guard against crashes from data saver listeners

Change-Id: I116c326ab8a26d8cbb0de12eba1e90c415df92ab
This commit is contained in:
Jason Monk
2016-04-12 15:45:27 +00:00
committed by android-build-merger

View File

@@ -33,24 +33,29 @@ public class DataSaverController {
}
private void handleRestrictBackgroundChanged(boolean isDataSaving) {
final int N = mListeners.size();
for (int i = 0; i < N; i++) {
mListeners.get(i).onDataSaverChanged(isDataSaving);
synchronized (mListeners) {
for (int i = 0; i < mListeners.size(); i++) {
mListeners.get(i).onDataSaverChanged(isDataSaving);
}
}
}
public void addListener(Listener listener) {
mListeners.add(listener);
if (mListeners.size() == 1) {
mPolicyManager.registerListener(mPolicyListener);
synchronized (mListeners) {
mListeners.add(listener);
if (mListeners.size() == 1) {
mPolicyManager.registerListener(mPolicyListener);
}
}
listener.onDataSaverChanged(isDataSaverEnabled());
}
public void remListener(Listener listener) {
mListeners.remove(listener);
if (mListeners.size() == 0) {
mPolicyManager.unregisterListener(mPolicyListener);
synchronized (mListeners) {
mListeners.remove(listener);
if (mListeners.size() == 0) {
mPolicyManager.unregisterListener(mPolicyListener);
}
}
}