Merge "Make package whitelist the last check in activity starter." into qt-dev am: 52981d54de (6b1ef193) · Commits · e / os / android_frameworks_base

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

+6 −6

Original line number	Diff line number	Diff line
		@@ -1011,12 +1011,6 @@ class ActivityStarter {
		if (mService.isAssociatedCompanionApp(callingUserId, callingUid)) {
		return false;
		}
		// don't abort if the callingPackage is temporarily whitelisted
		if (mService.isPackageNameWhitelistedForBgActivityStarts(callingPackage)) {
		Slog.w(TAG, "Background activity start for " + callingPackage
		+ " temporarily whitelisted. This will not be supported in future Q builds.");
		return false;
		}
		// If we don't have callerApp at this point, no caller was provided to startActivity().
		// That's the case for PendingIntent-based starts, since the creator's process might not be
		// up and alive. If that's the case, we retrieve the WindowProcessController for the send()
		@@ -1050,6 +1044,12 @@ class ActivityStarter {
		+ " allowed because SYSTEM_ALERT_WINDOW permission is granted.");
		return false;
		}
		// don't abort if the callingPackage is temporarily whitelisted
		if (mService.isPackageNameWhitelistedForBgActivityStarts(callingPackage)) {
		Slog.w(TAG, "Background activity start for " + callingPackage
		+ " temporarily whitelisted. This will not be supported in future Q builds.");
		return false;
		}
		// anything that has fallen through would currently be aborted
		Slog.w(TAG, "Background activity start [callingPackage: " + callingPackage
		+ "; callingUid: " + callingUid