From 77b0bbb4135ef63206848879b06929425ce67310 Mon Sep 17 00:00:00 2001
From: Yandry Perez Clemente <yandry@google.com>
Date: Wed, 15 Dec 2021 17:27:59 +0000
Subject: [PATCH] Fixes NullPointerException.

mPendingResult is not guaranteed to have been initialized at this point.

Test: Manual.
Bug: 210266601
Change-Id: I84287a068d03dd3aac2b046d1b8fdd8e6e52803f
---
 core/java/android/content/BroadcastReceiver.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/content/BroadcastReceiver.java b/core/java/android/content/BroadcastReceiver.java
index f335ae483bf7e..d46a0c67341f2 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,