From 3f98edb792e345313eed19324da7bc068d9a9719 Mon Sep 17 00:00:00 2001
From: Manuel Martin <imanol.martin@gmail.com>
Date: Mon, 14 Dec 2020 15:16:03 +0100
Subject: [PATCH] Concurrent Widgets fix (#3910)

---
 .../shared/org/mozilla/vrbrowser/VRBrowserActivity.java      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java b/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java
index 9ab355c86..c5f4e4946 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java
@@ -94,6 +94,7 @@
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Consumer;
 
 import static org.mozilla.vrbrowser.ui.widgets.UIWidget.REMOVE_WIDGET;
@@ -155,7 +156,7 @@ public void run() {
     static final long RESET_CRASH_COUNT_DELAY = 5000;
 
     static final String LOGTAG = SystemUtils.createLogtag(VRBrowserActivity.class);
-    HashMap<Integer, Widget> mWidgets;
+    ConcurrentHashMap<Integer, Widget> mWidgets;
     private int mWidgetHandleIndex = 1;
     AudioEngine mAudioEngine;
     OffscreenDisplay mOffscreenDisplay;
@@ -267,7 +268,7 @@ protected void onCreate(Bundle savedInstanceState) {
         mBrightnessQueue = new LinkedList<>();
         mCurrentBrightness = Pair.create(null, 1.0f);
 
-        mWidgets = new HashMap<>();
+        mWidgets = new ConcurrentHashMap<>();
         mWidgetContainer = new FrameLayout(this);
 
         mPermissionDelegate = new PermissionDelegate(this, this);