commit ed642a0135552d090cb207e4ced94d80514fc11b
author Aishwarya Mallampati <amallampati@google.com> Thu Jan 02 20:35:33 2025 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sun Jan 05 17:34:27 2025 -0800
tree 2ca06cc53980aa9bf4b8ce698d07ef2dc2b0977e
parent 517b9b4388c2f9f1c825754164b695a677620028

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

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

diff --git a/src/java/com/android/internal/telephony/ServiceStateTracker.java b/src/java/com/android/internal/telephony/ServiceStateTracker.java
index d0b2527..5a0b35f 100644
--- a/src/java/com/android/internal/telephony/ServiceStateTracker.java
+++ b/src/java/com/android/internal/telephony/ServiceStateTracker.java
@@ -3180,9 +3180,15 @@
         }
 
         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);