diff options
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/content/BroadcastReceiver.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/content/BroadcastReceiver.java b/core/java/android/content/BroadcastReceiver.java index f335ae483bf7..d46a0c67341f 100644 --- a/core/java/android/content/BroadcastReceiver.java +++ b/core/java/android/content/BroadcastReceiver.java @@ -392,7 +392,7 @@ public abstract class BroadcastReceiver { PendingResult res = mPendingResult; mPendingResult = null; - if (Trace.isTagEnabled(Trace.TRACE_TAG_ACTIVITY_MANAGER)) { + if (res != null && Trace.isTagEnabled(Trace.TRACE_TAG_ACTIVITY_MANAGER)) { res.mReceiverClassName = getClass().getName(); Trace.traceCounter(Trace.TRACE_TAG_ACTIVITY_MANAGER, "BroadcastReceiver#goAsync#ClassName:" + res.mReceiverClassName, |