Merge "Remove debug/redundant logs" into main (353c532d) · Commits · e / os / android_frameworks_base

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

+0 −14

Original line number	Diff line number	Diff line
		@@ -1091,11 +1091,6 @@ public class BackgroundActivityStartController {
		// don't abort if the callingUid has SYSTEM_ALERT_WINDOW permission
		if (mService.hasSystemAlertWindowPermission(state.mCallingUid, state.mCallingPid,
		state.mCallingPackage)) {
		Slog.w(
		TAG,
		"Background activity start for "
		+ state.mCallingPackage
		+ " allowed because SYSTEM_ALERT_WINDOW permission is granted.");
		return new BalVerdict(BAL_ALLOW_SAW_PERMISSION,
		/background/ true, "SYSTEM_ALERT_WINDOW permission is granted");
		}
		@@ -1167,18 +1162,9 @@ public class BackgroundActivityStartController {
		}

		// don't abort if the realCallingUid has SYSTEM_ALERT_WINDOW permission
		Slog.i(TAG, "hasSystemAlertWindowPermission(" + state.mRealCallingUid + ", "
		+ state.mRealCallingPid + ", " + state.mRealCallingPackage + ") "
		+ balStartModeToString(
		state.mCheckedOptions.getPendingIntentBackgroundActivityStartMode()));
		if (allowAlways
		&& mService.hasSystemAlertWindowPermission(state.mRealCallingUid,
		state.mRealCallingPid, state.mRealCallingPackage)) {
		Slog.w(
		TAG,
		"Background activity start for "
		+ state.mRealCallingPackage
		+ " allowed because SYSTEM_ALERT_WINDOW permission is granted.");
		return new BalVerdict(BAL_ALLOW_SAW_PERMISSION,
		/background/ true, "SYSTEM_ALERT_WINDOW permission is granted");
		}