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

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

Merge "Use the existing uptime for metrics in onShortFgsTimeout" into udc-dev

parents 6a6bb409 a5ee16f7

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

+1 −2
Original line number Diff line number Diff line
@@ -3356,10 +3356,9 @@ public final class ActiveServices { 
                return;

            }

            Slog.e(TAG_SERVICE, "Short FGS timed out: " + sr);

            final long now = SystemClock.uptimeMillis();

            logFGSStateChangeLocked(sr,

                    FOREGROUND_SERVICE_STATE_CHANGED__STATE__TIMED_OUT,

                    now > sr.mFgsEnterTime ? (int) (now - sr.mFgsEnterTime) : 0,

                    nowUptime > sr.mFgsEnterTime ? (int) (nowUptime - sr.mFgsEnterTime) : 0,

                    FGS_STOP_REASON_UNKNOWN,

                    FGS_TYPE_POLICY_CHECK_UNKNOWN);

            try {