commit f687e4ee996a38067a4038914996f752af2773da
author Sudheer Shanka <sudheersai@google.com> Mon Jan 22 21:57:37 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 22 21:57:37 2024 +0000
tree 29fdb8e5f9723f2f73e9dac832d06e5a5c025041
parent 2d06acae5bb2340385ccef2b5e4503317e078d82
parent 4862b154a2283055f97b904a172b78a47cd48dbe

Merge "Include broadcast deliveryTimeout() as a trace slice." into main

services/core/java/com/android/server/am/BroadcastQueueModernImpl.java

diff --git a/services/core/java/com/android/server/am/BroadcastQueueModernImpl.java b/services/core/java/com/android/server/am/BroadcastQueueModernImpl.java
index 2cac7a0..db0f03f 100644
--- a/services/core/java/com/android/server/am/BroadcastQueueModernImpl.java
+++ b/services/core/java/com/android/server/am/BroadcastQueueModernImpl.java
@@ -1244,9 +1244,11 @@
     }
 
     private void deliveryTimeout(@NonNull BroadcastProcessQueue queue) {
+        final int cookie = traceBegin("deliveryTimeout");
         synchronized (mService) {
             deliveryTimeoutLocked(queue);
         }
+        traceEnd(cookie);
     }
 
     private void deliveryTimeoutLocked(@NonNull BroadcastProcessQueue queue) {