Merge "Guard against crashes from data saver listeners" into nyc-dev (557c716a) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/policy/DataSaverController.java

+14 −9

Original line number	Diff line number	Diff line
		@@ -33,26 +33,31 @@ public class DataSaverController {
		}

		private void handleRestrictBackgroundChanged(boolean isDataSaving) {
		final int N = mListeners.size();
		for (int i = 0; i < N; i++) {
		synchronized (mListeners) {
		for (int i = 0; i < mListeners.size(); i++) {
		mListeners.get(i).onDataSaverChanged(isDataSaving);
		}
		}
		}

		public void addListener(Listener listener) {
		synchronized (mListeners) {
		mListeners.add(listener);
		if (mListeners.size() == 1) {
		mPolicyManager.registerListener(mPolicyListener);
		}
		}
		listener.onDataSaverChanged(isDataSaverEnabled());
		}

		public void remListener(Listener listener) {
		synchronized (mListeners) {
		mListeners.remove(listener);
		if (mListeners.size() == 0) {
		mPolicyManager.unregisterListener(mPolicyListener);
		}
		}
		}

		public boolean isDataSaverEnabled() {
		return mPolicyManager.getRestrictBackground();