Merge "DO NOT MERGE Synchronize ZenModeControllerImpl callbacks" (85666351) · Commits · e / os / android_frameworks_base

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

+28 −11

Original line number	Diff line number	Diff line
		@@ -53,6 +53,7 @@ public class ZenModeControllerImpl extends CurrentUserTracker implements ZenMode
		private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);

		private final ArrayList<Callback> mCallbacks = new ArrayList<Callback>();
		private final Object mCallbacksLock = new Object();
		private final Context mContext;
		private final GlobalSetting mModeSetting;
		private final GlobalSetting mConfigSetting;
		@@ -113,17 +114,21 @@ public class ZenModeControllerImpl extends CurrentUserTracker implements ZenMode

		@Override
		public void addCallback(Callback callback) {
		synchronized (mCallbacksLock) {
		if (callback == null) {
		Slog.e(TAG, "Attempted to add a null callback.");
		return;
		}
		mCallbacks.add(callback);
		}
		}

		@Override
		public void removeCallback(Callback callback) {
		synchronized (mCallbacksLock) {
		mCallbacks.remove(callback);
		}
		}

		@Override
		public int getZen() {
		@@ -186,29 +191,41 @@ public class ZenModeControllerImpl extends CurrentUserTracker implements ZenMode
		}

		private void fireNextAlarmChanged() {
		synchronized (mCallbacksLock) {
		Utils.safeForeach(mCallbacks, c -> c.onNextAlarmChanged());
		}
		}

		private void fireEffectsSuppressorChanged() {
		synchronized (mCallbacksLock) {
		Utils.safeForeach(mCallbacks, c -> c.onEffectsSupressorChanged());
		}
		}

		private void fireZenChanged(int zen) {
		synchronized (mCallbacksLock) {
		Utils.safeForeach(mCallbacks, c -> c.onZenChanged(zen));
		}
		}

		private void fireZenAvailableChanged(boolean available) {
		synchronized (mCallbacksLock) {
		Utils.safeForeach(mCallbacks, c -> c.onZenAvailableChanged(available));
		}
		}

		private void fireManualRuleChanged(ZenRule rule) {
		synchronized (mCallbacksLock) {
		Utils.safeForeach(mCallbacks, c -> c.onManualRuleChanged(rule));
		}
		}

		@VisibleForTesting
		protected void fireConfigChanged(ZenModeConfig config) {
		synchronized (mCallbacksLock) {
		Utils.safeForeach(mCallbacks, c -> c.onConfigChanged(config));
		}
		}

		@VisibleForTesting
		protected void updateZenMode(int mode) {