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

Commit 7e36537e authored by Makoto Onuki's avatar Makoto Onuki Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22909152



Change-Id: I89c8bc5a19cc3d1ca61df7b08a6b74c8ecdb2b50
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ea4a092c d29fa3e0

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 {