Merge "Move FGS while-in-use log message." into sc-dev (ac769c4d) · Commits · e / os / android_frameworks_base

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

+8 −8

Original line number	Diff line number	Diff line
		@@ -1706,14 +1706,6 @@ public final class ActiveServices {
		+ String.format("0x%08X", manifestType)
		+ " in service element of manifest file");
		}
		// If the foreground service is not started from TOP process, do not allow it to
		// have while-in-use location/camera/microphone access.
		if (!r.mAllowWhileInUsePermissionInFgs) {
		Slog.w(TAG,
		"Foreground service started from background can not have "
		+ "location/camera/microphone access: service "
		+ r.shortInstanceName);
		}
		}

		boolean alreadyStartedOp = false;
		@@ -1802,6 +1794,14 @@ public final class ActiveServices {
		r.appInfo.uid, r.intent.getIntent(), r, r.userId,false);
		}
		}
		// If the foreground service is not started from TOP process, do not allow it to
		// have while-in-use location/camera/microphone access.
		if (!r.mAllowWhileInUsePermissionInFgs) {
		Slog.w(TAG,
		"Foreground service started from background can not have "
		+ "location/camera/microphone access: service "
		+ r.shortInstanceName);
		}
		logFgsBackgroundStart(r);
		if (r.mAllowStartForeground == REASON_DENIED && isBgFgsRestrictionEnabled(r)) {
		final String msg = "Service.startForeground() not allowed due to "