Merge "Fix fatal exception in FakeBroadcastReceiver." into tm-qpr-dev am: 78f097adda

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

Change-Id: Ia322ee3e07e7a6ae18b36d8972a30914f1fbefe0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Aaron Liu
2022-12-02 18:20:03 +00:00
committed by Automerger Merge Worker

View File

@@ -22,12 +22,12 @@ import android.content.IntentFilter
import android.os.Handler import android.os.Handler
import android.os.Looper import android.os.Looper
import android.os.UserHandle import android.os.UserHandle
import android.util.ArraySet
import android.util.Log import android.util.Log
import com.android.systemui.SysuiTestableContext import com.android.systemui.SysuiTestableContext
import com.android.systemui.broadcast.logging.BroadcastDispatcherLogger import com.android.systemui.broadcast.logging.BroadcastDispatcherLogger
import com.android.systemui.dump.DumpManager import com.android.systemui.dump.DumpManager
import com.android.systemui.settings.UserTracker import com.android.systemui.settings.UserTracker
import java.util.concurrent.ConcurrentHashMap
import java.util.concurrent.Executor import java.util.concurrent.Executor
class FakeBroadcastDispatcher( class FakeBroadcastDispatcher(
@@ -50,7 +50,7 @@ class FakeBroadcastDispatcher(
PendingRemovalStore(logger) PendingRemovalStore(logger)
) { ) {
val registeredReceivers = ArraySet<BroadcastReceiver>() val registeredReceivers: MutableSet<BroadcastReceiver> = ConcurrentHashMap.newKeySet()
override fun registerReceiverWithHandler( override fun registerReceiverWithHandler(
receiver: BroadcastReceiver, receiver: BroadcastReceiver,