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

Commit 0d60b2fd 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: 1ffd35df 

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



Change-Id: Ide4be65cd7eb49d04e69ce7e2d8aaa671d58b2d1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 43c8bc1e 1ffd35df

packages/SystemUI/src/com/android/systemui/broadcast/UserBroadcastDispatcher.kt

+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, " +