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

Commit 91d9579e authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "upperLayerIndicator_r15 is optional, nr state design changed" am: c041126b 

Change-Id: I88b25ded56e13f19345b0fe829127cbaac98b9ae
parents 0ed9462f c041126b

src/java/com/android/internal/telephony/ServiceStateTracker.java

+6 −8
Original line number Diff line number Diff line
@@ -2047,18 +2047,16 @@ public class ServiceStateTracker extends Handler { 
            }

        }



        int newNrState = regInfo.getNrState();

        int oldNrState = regInfo.getNrState();

        int newNrState = oldNrState;

        if (hasNrSecondaryServingCell) {

            if (regInfo.getNrState() == NetworkRegistrationInfo.NR_STATE_NOT_RESTRICTED) {

            newNrState = NetworkRegistrationInfo.NR_STATE_CONNECTED;

            }

        } else {

            if (regInfo.getNrState() == NetworkRegistrationInfo.NR_STATE_CONNECTED) {

                newNrState = NetworkRegistrationInfo.NR_STATE_NOT_RESTRICTED;

            }

            regInfo.updateNrState();

            newNrState = regInfo.getNrState();

        }



        boolean hasChanged = newNrState != regInfo.getNrState();

        boolean hasChanged = newNrState != oldNrState;

        regInfo.setNrState(newNrState);

        ss.addNetworkRegistrationInfo(regInfo);

        return hasChanged;