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

Commit 0319d1cb authored by Peter Kalauskas's avatar Peter Kalauskas Committed by Automerger Merge Worker
Browse files

Merge "New trace sections for broadcast registrations" into tm-qpr-dev am:...

Merge "New trace sections for broadcast registrations" into tm-qpr-dev am: 1ffd35df am: 0d60b2fd

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



Change-Id: I562ec7a1ecce6f580ef9fe6d10bebed3a034ec1a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3aff84a2 0d60b2fd
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.content.BroadcastReceiver
import android.content.Context
import android.os.Handler
import android.os.Looper
import android.os.Trace
import android.os.UserHandle
import android.util.ArrayMap
import android.util.ArraySet
@@ -126,6 +127,7 @@ open class UserBroadcastDispatcher(
                action,
                userId,
                {
                    Trace.beginSection("registerReceiver act=$action user=$userId")
                    context.registerReceiverAsUser(
                            this,
                            UserHandle.of(userId),
@@ -134,11 +136,14 @@ open class UserBroadcastDispatcher(
                            workerHandler,
                            flags
                    )
                    Trace.endSection()
                    logger.logContextReceiverRegistered(userId, flags, it)
                },
                {
                    try {
                        Trace.beginSection("unregisterReceiver act=$action user=$userId")
                        context.unregisterReceiver(this)
                        Trace.endSection()
                        logger.logContextReceiverUnregistered(userId, action)
                    } catch (e: IllegalArgumentException) {
                        Log.e(TAG, "Trying to unregister unregistered receiver for user $userId, " +