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

Commit 3233d47f authored by Aishwarya Mallampati's avatar Aishwarya Mallampati Committed by Android (Google) Code Review
Browse files

Merge "Override satellite display name if we are in satellite mode and has... 

Merge "Override satellite display name if we are in satellite mode and has valid operator name." into main
parents caf02c62 4e8e3df7

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

+8 −2
Original line number Diff line number Diff line
@@ -3184,9 +3184,15 @@ public class ServiceStateTracker extends Handler { 
        }



        SatelliteModemStateListener satelliteModemStateListener = getSatelliteModemStateListener();

        String operator = mNewSS.getOperatorAlphaLong();

        SatelliteController sc = SatelliteController.getInstance();

        // Override satellite display name if device is in carrier roaming nb iot ntn mode

        // and has a valid operator

        if (satelliteModemStateListener != null

                && satelliteModemStateListener.isInConnectedState()) {

            // override satellite display name.

                && satelliteModemStateListener.isInConnectedState()

                || (!TextUtils.isEmpty(operator)

                        && sc != null && sc.isInCarrierRoamingNbIotNtn())) {

            // override satellite display name

            mNewSS.setOperatorName(

                    satelliteDisplayName, satelliteDisplayName, mNewSS.getOperatorNumeric());

            log("Override satellite display name to " + satelliteDisplayName);