Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update ANR latency tracker for short-FGS"

Browse Source
This commit is contained in:
Makoto Onuki
2022-12-05 23:28:51 +00:00
committed by Android (Google) Code Review
parent c5c7858b88 ad758fca1f
commit e652c10b4c
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/com/android/internal/os/anr/AnrLatencyTracker.java
View File

@@ -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;
}

1
services/core/java/com/android/server/am/ActiveServices.java
View File

@@ -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();