From ad758fca1f3ef94de03a65490ab011bc7ac49e24 Mon Sep 17 00:00:00 2001 From: Makoto Onuki Date: Mon, 5 Dec 2022 10:17:40 -0800 Subject: [PATCH] Update ANR latency tracker for short-FGS Bug: 257270313 Test: atest CtsShortFgsTestCases CtsAppFgsTestCases Change-Id: If6ca1fc37bc71e6b8369acc4815cd456d781fc40 --- core/java/com/android/internal/os/anr/AnrLatencyTracker.java | 3 +++ services/core/java/com/android/server/am/ActiveServices.java | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/core/java/com/android/internal/os/anr/AnrLatencyTracker.java b/core/java/com/android/internal/os/anr/AnrLatencyTracker.java index a182920cbf7a6..2748dedf356e6 100644 --- a/core/java/com/android/internal/os/anr/AnrLatencyTracker.java +++ b/core/java/com/android/internal/os/anr/AnrLatencyTracker.java @@ -24,6 +24,7 @@ import static com.android.internal.util.FrameworkStatsLog.ANRLATENCY_REPORTED__A import static com.android.internal.util.FrameworkStatsLog.ANRLATENCY_REPORTED__ANR_TYPE__EXECUTING_SERVICE; import static com.android.internal.util.FrameworkStatsLog.ANRLATENCY_REPORTED__ANR_TYPE__INPUT_DISPATCHING_TIMEOUT; import static com.android.internal.util.FrameworkStatsLog.ANRLATENCY_REPORTED__ANR_TYPE__INPUT_DISPATCHING_TIMEOUT_NO_FOCUSED_WINDOW; +import static com.android.internal.util.FrameworkStatsLog.ANRLATENCY_REPORTED__ANR_TYPE__SHORT_FGS_TIMEOUT; import static com.android.internal.util.FrameworkStatsLog.ANRLATENCY_REPORTED__ANR_TYPE__START_FOREGROUND_SERVICE; import static com.android.internal.util.FrameworkStatsLog.ANRLATENCY_REPORTED__ANR_TYPE__UNKNOWN_ANR_TYPE; @@ -400,6 +401,8 @@ public class AnrLatencyTracker implements AutoCloseable { return ANRLATENCY_REPORTED__ANR_TYPE__EXECUTING_SERVICE; case TimeoutKind.CONTENT_PROVIDER: return ANRLATENCY_REPORTED__ANR_TYPE__CONTENT_PROVIDER_NOT_RESPONDING; + case TimeoutKind.SHORT_FGS_TIMEOUT: + return ANRLATENCY_REPORTED__ANR_TYPE__SHORT_FGS_TIMEOUT; default: return ANRLATENCY_REPORTED__ANR_TYPE__UNKNOWN_ANR_TYPE; } diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java index 2a44e3037b50a..dccbe33386de6 100644 --- a/services/core/java/com/android/server/am/ActiveServices.java +++ b/services/core/java/com/android/server/am/ActiveServices.java @@ -3016,7 +3016,6 @@ public final class ActiveServices { final TimeoutRecord tr = TimeoutRecord.forShortFgsTimeout(reason); - // TODO(short-service): TODO Add SHORT_FGS_TIMEOUT to AnrLatencyTracker tr.mLatencyTracker.waitingOnAMSLockStarted(); synchronized (mAm) { tr.mLatencyTracker.waitingOnAMSLockEnded();