Merge \"SysUI: Protect against crash in BatteryController\" into nyc-mr1-dev (22769242) · Commits · e / os / android_frameworks_base

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

+16 −8

Original line number	Diff line number	Diff line
		@@ -89,15 +89,19 @@ public class BatteryControllerImpl extends BroadcastReceiver implements BatteryC

		@Override
		public void addStateChangedCallback(BatteryController.BatteryStateChangeCallback cb) {
		synchronized (mChangeCallbacks) {
		mChangeCallbacks.add(cb);
		}
		cb.onBatteryLevelChanged(mLevel, mPluggedIn, mCharging);
		cb.onPowerSaveChanged(mPowerSave);
		}

		@Override
		public void removeStateChangedCallback(BatteryController.BatteryStateChangeCallback cb) {
		synchronized (mChangeCallbacks) {
		mChangeCallbacks.remove(cb);
		}
		}

		@Override
		public void onReceive(final Context context, Intent intent) {
		@@ -171,18 +175,22 @@ public class BatteryControllerImpl extends BroadcastReceiver implements BatteryC
		}

		protected void fireBatteryLevelChanged() {
		synchronized (mChangeCallbacks) {
		final int N = mChangeCallbacks.size();
		for (int i = 0; i < N; i++) {
		mChangeCallbacks.get(i).onBatteryLevelChanged(mLevel, mPluggedIn, mCharging);
		}
		}
		}

		private void firePowerSaveChanged() {
		synchronized (mChangeCallbacks) {
		final int N = mChangeCallbacks.size();
		for (int i = 0; i < N; i++) {
		mChangeCallbacks.get(i).onPowerSaveChanged(mPowerSave);
		}
		}
		}

		private boolean mDemoMode;