Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f0535c6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use a concurrent hash map to access VolumeDialogControllerImpl's... 

Merge "Use a concurrent hash map to access VolumeDialogControllerImpl's callbacks" am: ce7d3209 am: 333fdf8c am: 19797c2d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1247026

Change-Id: I727723ed6f0685b43b499453256ae3de8c7d65e5
parents 590d59c3 19797c2d

packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -75,6 +75,7 @@ import java.util.HashMap; 
import java.util.Map;

import java.util.Map;

import java.util.Objects;

import java.util.Objects;

import java.util.Optional;

import java.util.Optional;

import java.util.concurrent.ConcurrentHashMap;





import javax.inject.Inject;

import javax.inject.Inject;

import javax.inject.Singleton;

import javax.inject.Singleton;
@@ -829,7 +830,7 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa 
    }

    }





    class C implements Callbacks {

    class C implements Callbacks {

        private final HashMap<Callbacks, Handler> mCallbackMap = new HashMap<>();

        private final Map<Callbacks, Handler> mCallbackMap = new ConcurrentHashMap<>();





        public void add(Callbacks callback, Handler handler) {

        public void add(Callbacks callback, Handler handler) {

            if (callback == null || handler == null) throw new IllegalArgumentException();

            if (callback == null || handler == null) throw new IllegalArgumentException();