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

Commit 51ef54a2 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/31143495'] into 25Q1-release.

Change-Id: Id71075979bcbda1bade054c122bd85a417bf3296
parents 517b9b43 ed642a01
Loading
Loading
Loading
Loading
+8 −2
Original line number Diff line number Diff line
@@ -3180,9 +3180,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);