Merge "Protect against mConfigs changes in writeXml" into qt-dev (5779ed51) · Commits · e / os / android_frameworks_base

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

+7 −6

Original line number	Diff line number	Diff line
		@@ -80,7 +80,6 @@ import org.xmlpull.v1.XmlSerializer;
		import java.io.IOException;
		import java.io.PrintWriter;
		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.List;
		import java.util.Objects;

		@@ -731,14 +730,16 @@ public class ZenModeHelper {

		public void writeXml(XmlSerializer out, boolean forBackup, Integer version, int userId)
		throws IOException {
		final int N = mConfigs.size();
		for (int i = 0; i < N; i++) {
		synchronized (mConfigs) {
		final int n = mConfigs.size();
		for (int i = 0; i < n; i++) {
		if (forBackup && mConfigs.keyAt(i) != userId) {
		continue;
		}
		mConfigs.valueAt(i).writeXml(out, version);
		}
		}
		}

		/**
		* @return user-specified default notification policy for priority only do not disturb