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

Commit e31f2125 authored by David Lin's avatar David Lin Committed by Android (Google) Code Review
Browse files

Merge "Don't throw ANR if onTimeout flag is disabled." into 24D1-dev

parents 3e51ebc5 078dbc16

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()) {