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

Commit e652c10b authored by Makoto Onuki's avatar Makoto Onuki Committed by Android (Google) Code Review
Browse files

Merge "Update ANR latency tracker for short-FGS"

parents c5c7858b ad758fca

core/java/com/android/internal/os/anr/AnrLatencyTracker.java

+3 −0
Original line number Diff line number Diff line
@@ -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;

        }

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

+0 −1
Original line number Diff line number Diff line
@@ -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();