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

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

Merge "Fix NPE in updateNrState" into rvc-dev am: 7bc7f922 

Change-Id: I600d9d5df1cadd2b47752b82ab91df9b0bae4805
parents 01a94e2a 7bc7f922

telephony/java/android/telephony/NetworkRegistrationInfo.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -690,7 +690,7 @@ public final class NetworkRegistrationInfo implements Parcelable { 
     */

     */

    public void updateNrState() {

    public void updateNrState() {

        mNrState = NR_STATE_NONE;

        mNrState = NR_STATE_NONE;

        if (mDataSpecificInfo.isEnDcAvailable) {

        if (mDataSpecificInfo != null && mDataSpecificInfo.isEnDcAvailable) {

            if (!mDataSpecificInfo.isDcNrRestricted && mDataSpecificInfo.isNrAvailable) {

            if (!mDataSpecificInfo.isDcNrRestricted && mDataSpecificInfo.isNrAvailable) {

                mNrState = NR_STATE_NOT_RESTRICTED;

                mNrState = NR_STATE_NOT_RESTRICTED;

            } else {

            } else {