Merge "Synchronize access of mSubscriptions" am: d065220a54 am: 8434b4cf1b (9ed59cfd) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/notification/ZenModeConditions.java

+14 −9

Original line number	Diff line number	Diff line
		@@ -72,6 +72,8 @@ public class ZenModeConditions implements ConditionProviders.Callback {
		evaluateRule(automaticRule, current, processSubscriptions);
		updateSnoozing(automaticRule);
		}

		synchronized (mSubscriptions) {
		final int N = mSubscriptions.size();
		for (int i = N - 1; i >= 0; i--) {
		final Uri id = mSubscriptions.keyAt(i);
		@@ -83,6 +85,7 @@ public class ZenModeConditions implements ConditionProviders.Callback {
		}
		}
		}
		}
		mFirstEvaluation = false;
		}

		@@ -145,7 +148,9 @@ public class ZenModeConditions implements ConditionProviders.Callback {
		}
		if (processSubscriptions) {
		if (mConditionProviders.subscribeIfNecessary(rule.component, rule.conditionId)) {
		synchronized (mSubscriptions) {
		mSubscriptions.put(rule.conditionId, rule.component);
		}
		} else {
		if (DEBUG) Log.d(TAG, "zmc failed to subscribe");
		}