diff options
| author | Kevin Liu <congxiliu@google.com> | 2023-02-17 16:59:06 +0000 |
|---|---|---|
| committer | Rex Hoffman <rexhoffman@google.com> | 2023-04-18 16:26:19 +0000 |
| commit | d1d388775157f87fa1d28a8a27686f00ece133f4 (patch) | |
| tree | 91f72dd1bdbbca453e6f387bd9133e7f34ace37e | |
| parent | 3d83c7151adc47ffa5d7b9b376f100deed906042 (diff) | |
| download | robolectric-d1d388775157f87fa1d28a8a27686f00ece133f4.tar.gz | |
Fix missing type change in shadow
Update the mDisplayInfoCache type change from previous ArrayList to CopyOnWriteArrayList
Bug: 269749245
Fix: 271159830
Test: atest MyRoboTests
Change-Id: I8423c40dbd0edef45f810525ad7d070c3fe61ce6
(cherry picked from commit aa76a8293c4ec8dfd73d929c49ed828a1ea5ce34)
Change-Id: Ic93a521aa10753d95bae9a881e32c469014f1532
Merged-In: Ic93a521aa10753d95bae9a881e32c469014f1532
Merged-In: I8423c40dbd0edef45f810525ad7d070c3fe61ce6
Merged-In: I8423c40dbd0edef45f810525ad7d070c3fe61ce6
| -rw-r--r-- | shadows/framework/src/main/java/org/robolectric/shadows/ShadowDisplayManagerGlobal.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowDisplayManagerGlobal.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowDisplayManagerGlobal.java index c28e51f42..c6c2b1f1c 100644 --- a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowDisplayManagerGlobal.java +++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowDisplayManagerGlobal.java @@ -21,6 +21,7 @@ import com.google.common.annotations.VisibleForTesting; import java.util.ArrayList; import java.util.List; import java.util.TreeMap; +import java.util.concurrent.CopyOnWriteArrayList; import javax.annotation.Nullable; import org.robolectric.android.Bootstrap; import org.robolectric.annotation.HiddenApi; @@ -81,7 +82,7 @@ public class ShadowDisplayManagerGlobal { reflector(DisplayManagerGlobalReflector.class, instance); displayManagerGlobal.setDm(displayManager); displayManagerGlobal.setLock(new Object()); - displayManagerGlobal.setDisplayListeners(new ArrayList<>()); + displayManagerGlobal.setDisplayListeners(new CopyOnWriteArrayList<>()); displayManagerGlobal.setDisplayInfoCache(new SparseArray<>()); return instance; } @@ -264,7 +265,7 @@ public class ShadowDisplayManagerGlobal { void setLock(Object lock); @Accessor("mDisplayListeners") - void setDisplayListeners(ArrayList<Handler> list); + void setDisplayListeners(CopyOnWriteArrayList<Handler> list); @Accessor("mDisplayInfoCache") void setDisplayInfoCache(SparseArray<DisplayInfo> displayInfoCache); |