Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix dumb bug merging receivers for multiple users." into jb-mr1-dev

Browse Source
This commit is contained in:
Dianne Hackborn
2012-09-17 18:52:30 -07:00
committed by Android (Google) Code Review
parent 21dfd7c5fe 6cbd33fc25
commit c535d2f30e
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/java/com/android/server/am/ActivityManagerService.java
View File

@@ -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);

10
services/java/com/android/server/am/BroadcastQueue.java
View File

@@ -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) {