Merge "Fix dumb bug merging receivers for multiple users." into jb-mr1-dev (c535d2f3) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -11438,7 +11438,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		// Add the new results to the existing results, tracking
		// and de-dupping single user receivers.
		for (int i=0; i<newReceivers.size(); i++) {
		ResolveInfo ri = receivers.get(i);
		ResolveInfo ri = newReceivers.get(i);
		if ((ri.activityInfo.flags&ActivityInfo.FLAG_SINGLE_USER) != 0) {
		ComponentName cn = new ComponentName(
		ri.activityInfo.packageName, ri.activityInfo.name);

+6 −4

Original line number	Diff line number	Diff line
		@@ -965,12 +965,12 @@ public class BroadcastQueue {
		if (!printed) {
		if (needSep) {
		pw.println();
		needSep = false;
		}
		needSep = true;
		printed = true;
		pw.println(" Active broadcasts [" + mQueueName + "]:");
		}
		pw.println(" Broadcast #" + i + ":");
		pw.println(" Active Broadcast " + mQueueName + " #" + i + ":");
		br.dump(pw, " ");
		}
		printed = false;
		@@ -985,9 +985,10 @@ public class BroadcastQueue {
		pw.println();
		}
		needSep = true;
		printed = true;
		pw.println(" Active ordered broadcasts [" + mQueueName + "]:");
		}
		pw.println(" Ordered Broadcast #" + i + ":");
		pw.println(" Active Ordered Broadcast " + mQueueName + " #" + i + ":");
		mOrderedBroadcasts.get(i).dump(pw, " ");
		}
		if (dumpPackage == null \|\| (mPendingBroadcast != null
		@@ -1023,7 +1024,8 @@ public class BroadcastQueue {
		printed = true;
		}
		if (dumpAll) {
		pw.print(" Historical Broadcast #"); pw.print(i); pw.println(":");
		pw.print(" Historical Broadcast " + mQueueName + " #");
		pw.print(i); pw.println(":");
		r.dump(pw, " ");
		} else {
		if (i >= 50) {