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

Commit ed642a01 authored by Aishwarya Mallampati's avatar Aishwarya Mallampati Committed by Android Build Coastguard Worker
Browse files

Override satellite display name if we are in satellite mode and has 

valid operator name.

Bug: 386258516
Test: 387347224
FLAG: EXEMPT bugfix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4e8e3df744d148bcba930e218828203080e23156)
Merged-In: I83ba0280a780fe85e6b32989c6bd576253ff9ef6
Change-Id: I83ba0280a780fe85e6b32989c6bd576253ff9ef6
parent 517b9b43

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

+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);