summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings
diff options
context:
space:
mode:
authorJason Chiu <chiujason@google.com>2020-07-06 02:48:31 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-07-06 02:48:31 +0000
commit98eedf79d58bef50cc8f6204d028c569b70e1e57 (patch)
tree343baefabb9a3b4b14fd9136683070883726a160 /src/com/android/settings
parent6458ea872c96d07a5a777d03ceffef1d539fc4f2 (diff)
parentea689abbcd16363fccde246b61b4e5ebf896902a (diff)
downloadpackages_apps_Settings-98eedf79d58bef50cc8f6204d028c569b70e1e57.tar.gz
packages_apps_Settings-98eedf79d58bef50cc8f6204d028c569b70e1e57.tar.bz2
packages_apps_Settings-98eedf79d58bef50cc8f6204d028c569b70e1e57.zip
Merge "Fix the exception of accessing an ArrayMap" into rvc-dev
Diffstat (limited to 'src/com/android/settings')
-rw-r--r--src/com/android/settings/slices/SliceBackgroundWorker.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/settings/slices/SliceBackgroundWorker.java b/src/com/android/settings/slices/SliceBackgroundWorker.java
index 6eb154e955..2b029999ef 100644
--- a/src/com/android/settings/slices/SliceBackgroundWorker.java
+++ b/src/com/android/settings/slices/SliceBackgroundWorker.java
@@ -33,6 +33,7 @@ import java.io.Closeable;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -190,7 +191,8 @@ public abstract class SliceBackgroundWorker<E> implements Closeable {
private static NotifySliceChangeHandler sHandler;
- private final Map<Uri, Long> mLastUpdateTimeLookup = new ArrayMap<>();
+ private final Map<Uri, Long> mLastUpdateTimeLookup = Collections.synchronizedMap(
+ new ArrayMap<>());
private static NotifySliceChangeHandler getInstance() {
if (sHandler == null) {