Merge "Move the boot_completed FGS check" into main (e9a8ffd9) · Commits · e / os / android_frameworks_base

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

+6 −5

Original line number	Diff line number	Diff line
		@@ -2118,11 +2118,6 @@ public final class ActiveServices {
		// anyway, so we just remove the SHORT_SERVICE type.
		foregroundServiceType &= ~FOREGROUND_SERVICE_TYPE_SHORT_SERVICE;
		}
		if (!shouldAllowBootCompletedStart(r, foregroundServiceType)) {
		throw new ForegroundServiceStartNotAllowedException("FGS type "
		+ ServiceInfo.foregroundServiceTypeToLabel(foregroundServiceType)
		+ " not allowed to start from BOOT_COMPLETED!");
		}

		boolean alreadyStartedOp = false;
		boolean stopProcStatsOp = false;
		@@ -2137,6 +2132,12 @@ public final class ActiveServices {
		mServiceFGAnrTimer.cancel(r);
		}

		if (!shouldAllowBootCompletedStart(r, foregroundServiceType)) {
		throw new ForegroundServiceStartNotAllowedException("FGS type "
		+ ServiceInfo.foregroundServiceTypeToLabel(foregroundServiceType)
		+ " not allowed to start from BOOT_COMPLETED!");
		}

		final ProcessServiceRecord psr = r.app.mServices;
		try {
		boolean ignoreForeground = false;