Merge "Fix NPE in updateNrState"

2020-03-23 22:14:12 +00:00
parent 074af36692 bf421a9826
commit 3782fad894
1 changed files with 1 additions and 1 deletions
--- 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 {