summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorEvans Thomas <ethomast@google.com>2013-09-04 11:04:05 +0900
committerDianne Hackborn <hackbod@google.com>2013-09-04 21:10:12 -0700
commit880e5d486ed6f27d83aefa499890694850948282 (patch)
tree15e33f643d28a6e8f8d99e55704561c9fc89da75 /services
parent7f95595fe7c08e62e0468d1c718cdf6ebed974b0 (diff)
downloadframeworks_base-880e5d486ed6f27d83aefa499890694850948282.zip
frameworks_base-880e5d486ed6f27d83aefa499890694850948282.tar.gz
frameworks_base-880e5d486ed6f27d83aefa499890694850948282.tar.bz2
Fix crash when dump() is called on ReceiverList
Bug: 9750621 Change-Id: Ie203bc008747cd2def5839e64b27a2f98dbc6950
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/am/ReceiverList.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/am/ReceiverList.java b/services/java/com/android/server/am/ReceiverList.java
index b19cc5d..fa8c1df 100644
--- a/services/java/com/android/server/am/ReceiverList.java
+++ b/services/java/com/android/server/am/ReceiverList.java
@@ -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) {