Fix dumb bug merging receivers for multiple users.

Dianne Hackborn · Dianne Hackborn · commit 6cbd33fc25fa · 2012-09-17T18:43:00.000-07:00
Also clean up some debug output.

Change-Id: Ib19e47682e9ddfc6a234bd61d054275a362d28cc
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
@@ -11432,7 +11432,7 @@ private List<ResolveInfo> collectReceiverComponents(Intent intent, String resolv
                     // 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);
diff --git a/services/java/com/android/server/am/BroadcastQueue.java b/services/java/com/android/server/am/BroadcastQueue.java
@@ -965,12 +965,12 @@ final boolean dumpLocked(FileDescriptor fd, PrintWriter pw, String[] args,
                 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 @@ final boolean dumpLocked(FileDescriptor fd, PrintWriter pw, String[] args,
                         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 @@ final boolean dumpLocked(FileDescriptor fd, PrintWriter pw, String[] args,
                 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) {

Original file line number	Diff line number	Diff line change
`@@ -965,12 +965,12 @@ final boolean dumpLocked(FileDescriptor fd, PrintWriter pw, String[] args,`
`965`	`965`	`if (!printed) {`
`966`	`966`	`if (needSep) {`
`967`	`967`	`pw.println();`
`968`		`- needSep = false;`
`969`	`968`	`}`
	`969`	`+ needSep = true;`
`970`	`970`	`printed = true;`
`971`	`971`	`pw.println(" Active broadcasts [" + mQueueName + "]:");`
`972`	`972`	`}`
`973`		`- pw.println(" Broadcast #" + i + ":");`
	`973`	`+ pw.println(" Active Broadcast " + mQueueName + " #" + i + ":");`
`974`	`974`	`br.dump(pw, " ");`
`975`	`975`	`}`
`976`	`976`	`printed = false;`
`@@ -985,9 +985,10 @@ final boolean dumpLocked(FileDescriptor fd, PrintWriter pw, String[] args,`
`985`	`985`	`pw.println();`
`986`	`986`	`}`
`987`	`987`	`needSep = true;`
	`988`	`+ printed = true;`
`988`	`989`	`pw.println(" Active ordered broadcasts [" + mQueueName + "]:");`
`989`	`990`	`}`
`990`		`- pw.println(" Ordered Broadcast #" + i + ":");`
	`991`	`+ pw.println(" Active Ordered Broadcast " + mQueueName + " #" + i + ":");`
`991`	`992`	`mOrderedBroadcasts.get(i).dump(pw, " ");`
`992`	`993`	`}`
`993`	`994`	`if (dumpPackage == null \|\| (mPendingBroadcast != null`
`@@ -1023,7 +1024,8 @@ final boolean dumpLocked(FileDescriptor fd, PrintWriter pw, String[] args,`
`1023`	`1024`	`printed = true;`
`1024`	`1025`	`}`
`1025`	`1026`	`if (dumpAll) {`
`1026`		`- pw.print(" Historical Broadcast #"); pw.print(i); pw.println(":");`
	`1027`	`+ pw.print(" Historical Broadcast " + mQueueName + " #");`
	`1028`	`+ pw.print(i); pw.println(":");`
`1027`	`1029`	`r.dump(pw, " ");`
`1028`	`1030`	`} else {`
`1029`	`1031`	`if (i >= 50) {`