Merge "A little more logging for receiver reregistration" (fbe85538) · Commits · e / os / android_frameworks_base

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

+6 −3

Original line number	Diff line number	Diff line
		@@ -18032,15 +18032,18 @@ public class ActivityManagerService extends IActivityManager.Stub
		} else if (rl.uid != callingUid) {
		throw new IllegalArgumentException(
		"Receiver requested to register for uid " + callingUid
		+ " was previously registered for uid " + rl.uid);
		+ " was previously registered for uid " + rl.uid
		+ " callerPackage is " + callerPackage);
		} else if (rl.pid != callingPid) {
		throw new IllegalArgumentException(
		"Receiver requested to register for pid " + callingPid
		+ " was previously registered for pid " + rl.pid);
		+ " was previously registered for pid " + rl.pid
		+ " callerPackage is " + callerPackage);
		} else if (rl.userId != userId) {
		throw new IllegalArgumentException(
		"Receiver requested to register for user " + userId
		+ " was previously registered for user " + rl.userId);
		+ " was previously registered for user " + rl.userId
		+ " callerPackage is " + callerPackage);
		}
		BroadcastFilter bf = new BroadcastFilter(filter, rl, callerPackage,
		permission, callingUid, userId);