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

Commit 5a7d46a4 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/27031947'] into 24Q2-release. 

Change-Id: Ic4c92a5a0eb1f0332fd2a98be5d9ccb9e6b2f10f
parents 8e203216 ba82ea3c

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

+3 −1
Original line number Diff line number Diff line
@@ -3696,9 +3696,11 @@ public final class ActiveServices { 
            // is not "now". Compute the time from "now" when starting the anr timer.

            final long anrTime = sr.getEarliestStopTypeAndTime().second

                    + mAm.mConstants.mFgsAnrExtraWaitDuration - SystemClock.uptimeMillis();

            if (android.app.Flags.introduceNewServiceOntimeoutCallback()) {

                mFGSAnrTimer.start(sr, anrTime);

            }

        }

    }



    private void maybeUpdateFgsTrackingLocked(ServiceRecord sr, boolean extendTimeout) {

        if (!sr.isFgsTimeLimited()) {