am d67f18cf: Merge "Fix crash when dump() is called on ReceiverList" into klp-dev

* commit 'd67f18cf93679e1255f082a9121a3acda97bc0b5':
  Fix crash when dump() is called on ReceiverList
This commit is contained in:
Dianne Hackborn
2013-09-05 15:20:26 -07:00
committed by Android Git Automerger

View File

@@ -69,7 +69,7 @@ final class ReceiverList extends ArrayList<BroadcastFilter>
}
void dumpLocal(PrintWriter pw, String prefix) {
pw.print(prefix); pw.print("app="); pw.print(app.toShortString());
pw.print(prefix); pw.print("app="); pw.print(app != null ? app.toShortString() : null);
pw.print(" pid="); pw.print(pid); pw.print(" uid="); pw.print(uid);
pw.print(" user="); pw.println(userId);
if (curBroadcast != null || linkedToDeath) {