From bf421a982604d5fba8f448536ace84b5b86e9618 Mon Sep 17 00:00:00 2001
From: Sarah Chin <sarahchin@google.com>
Date: Fri, 20 Mar 2020 11:16:52 -0700
Subject: [PATCH] Fix NPE in updateNrState

Test: build
Bug: 151837748
Change-Id: Ia05cb6b43a79524501821467c510f595f7a64ebe
Merged-In: Ia05cb6b43a79524501821467c510f595f7a64ebe
---
 telephony/java/android/telephony/NetworkRegistrationInfo.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/telephony/java/android/telephony/NetworkRegistrationInfo.java b/telephony/java/android/telephony/NetworkRegistrationInfo.java
index 3e901e241e015..b12faf75da213 100644
--- a/telephony/java/android/telephony/NetworkRegistrationInfo.java
+++ b/telephony/java/android/telephony/NetworkRegistrationInfo.java
@@ -689,7 +689,7 @@ public final class NetworkRegistrationInfo implements Parcelable {
      */
     public void updateNrState() {
         mNrState = NR_STATE_NONE;
-        if (mDataSpecificInfo.isEnDcAvailable) {
+        if (mDataSpecificInfo != null && mDataSpecificInfo.isEnDcAvailable) {
             if (!mDataSpecificInfo.isDcNrRestricted && mDataSpecificInfo.isNrAvailable) {
                 mNrState = NR_STATE_NOT_RESTRICTED;
             } else {