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

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

Change-Id: Ide4be65cd7eb49d04e69ce7e2d8aaa671d58b2d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Peter Kalauskas
2022-11-01 19:53:32 +00:00
committed by Automerger Merge Worker

View File

@@ -21,6 +21,7 @@ import android.content.BroadcastReceiver
import android.content.Context import android.content.Context
import android.os.Handler import android.os.Handler
import android.os.Looper import android.os.Looper
import android.os.Trace
import android.os.UserHandle import android.os.UserHandle
import android.util.ArrayMap import android.util.ArrayMap
import android.util.ArraySet import android.util.ArraySet
@@ -126,6 +127,7 @@ open class UserBroadcastDispatcher(
action, action,
userId, userId,
{ {
Trace.beginSection("registerReceiver act=$action user=$userId")
context.registerReceiverAsUser( context.registerReceiverAsUser(
this, this,
UserHandle.of(userId), UserHandle.of(userId),
@@ -134,11 +136,14 @@ open class UserBroadcastDispatcher(
workerHandler, workerHandler,
flags flags
) )
Trace.endSection()
logger.logContextReceiverRegistered(userId, flags, it) logger.logContextReceiverRegistered(userId, flags, it)
}, },
{ {
try { try {
Trace.beginSection("unregisterReceiver act=$action user=$userId")
context.unregisterReceiver(this) context.unregisterReceiver(this)
Trace.endSection()
logger.logContextReceiverUnregistered(userId, action) logger.logContextReceiverUnregistered(userId, action)
} catch (e: IllegalArgumentException) { } catch (e: IllegalArgumentException) {
Log.e(TAG, "Trying to unregister unregistered receiver for user $userId, " + Log.e(TAG, "Trying to unregister unregistered receiver for user $userId, " +