Merge "Fixes NullPointerException."
This commit is contained in:
committed by
Android (Google) Code Review
commit
b9cd53b835
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user