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

Commit 4b38768a authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE in updateNrState" am: 3782fad8 am: a71b527a 

Change-Id: I4a522898bf627dff26f13921696f7bc46db06fe1
parents 9bebdb47 a71b527a

telephony/java/android/telephony/NetworkRegistrationInfo.java

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