Merge "Remove redundant logs" into main (318ecf96) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/BackgroundActivityStartController.java

+0 −9

Original line number	Diff line number	Diff line
		@@ -714,9 +714,6 @@ public class BackgroundActivityStartController {

		if (!state.hasRealCaller()) {
		if (resultForCaller.allows()) {
		if (DEBUG_ACTIVITY_STARTS) {
		Slog.d(TAG, "Background activity start allowed. " + state);
		}
		return allowBasedOnCaller(state);
		}
		return abortLaunch(state);
		@@ -742,15 +739,9 @@ public class BackgroundActivityStartController {

		// Handle cases with explicit opt-in
		if (resultForCaller.allows() && state.callerExplicitOptInOrAutoOptIn()) {
		if (DEBUG_ACTIVITY_STARTS) {
		Slog.d(TAG, "Activity start explicitly allowed by caller. " + state);
		}
		return allowBasedOnCaller(state);
		}
		if (resultForRealCaller.allows() && state.realCallerExplicitOptInOrAutoOptIn()) {
		if (DEBUG_ACTIVITY_STARTS) {
		Slog.d(TAG, "Activity start explicitly allowed by real caller. " + state);
		}
		return allowBasedOnRealCaller(state);
		}
		// Handle PendingIntent cases with default behavior next