Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9cd53b8 authored by Yandry Perez Clemente's avatar Yandry Perez Clemente Committed by Android (Google) Code Review
Browse files

Merge "Fixes NullPointerException."

parents cd8fb61f 77b0bbb4

core/java/android/content/BroadcastReceiver.java

+1 −1
Original line number Diff line number Diff line
@@ -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,