Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Protect against mConfigs changes in writeXml" into qt-dev

Browse Source 
am: 5779ed51c2

Change-Id: Ia0483891047bb38b1fc1184d3547cb27b2286b80
This commit is contained in:
Beverly
2019-04-30 14:57:16 -07:00
committed by android-build-merger
parent 427347cc23 5779ed51c2
commit df5f186c25
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/notification/ZenModeHelper.java
View File

@@ -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,12 +730,14 @@ 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++) {
if (forBackup && mConfigs.keyAt(i) != userId) {
continue;
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);
}
mConfigs.valueAt(i).writeXml(out, version);
}
}