Merge "Don't throw ANR if onTimeout flag is disabled." into main (c244ac8d) · Commits · e / os / android_frameworks_base

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -3867,10 +3867,12 @@ public final class ActiveServices {
		Slog.w(TAG_SERVICE, "Exception from scheduleTimeoutServiceForType: " + e);
		}

		if (android.app.Flags.introduceNewServiceOntimeoutCallback()) {
		// ANR the service after giving the service some time to clean up.
		mFGSAnrTimer.start(sr, mAm.mConstants.mFgsAnrExtraWaitDuration);
		}
		}
		}

		void onFgsAnrTimeout(ServiceRecord sr) {
		final int fgsType = getTimeLimitedFgsType(sr.foregroundServiceType);