Merge "Use callerPackage instead of callerApp." into nyc-dev (03c7b09a) · Commits · e / os / android_frameworks_base

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -17144,7 +17144,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		// but historically it has not been protected and apps may be using it
		// to poke their own app widget. So, instead of making it protected,
		// just limit it to the caller.
		if (callerApp == null) {
		if (callerPackage == null) {
		String msg = "Permission Denial: not allowed to send broadcast "
		+ action + " from unknown caller.";
		Slog.w(TAG, msg);
		@@ -17153,17 +17153,17 @@ public final class ActivityManagerService extends ActivityManagerNative
		// They are good enough to send to an explicit component... verify
		// it is being sent to the calling app.
		if (!intent.getComponent().getPackageName().equals(
		callerApp.info.packageName)) {
		callerPackage)) {
		String msg = "Permission Denial: not allowed to send broadcast "
		+ action + " to "
		+ intent.getComponent().getPackageName() + " from "
		+ callerApp.info.packageName;
		+ callerPackage;
		Slog.w(TAG, msg);
		throw new SecurityException(msg);
		}
		} else {
		// Limit broadcast to their own package.
		intent.setPackage(callerApp.info.packageName);
		intent.setPackage(callerPackage);
		}
		}
		}