commit bfa9a1304930529f54cd4d25a953d5216720ecf8
author SongFerngWang <songferngwang@google.com> Fri May 15 08:20:29 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 15 08:20:29 2020 +0000
tree b836c3dfe87b8b59f5a05bd410a038a797d31c06
parent 580257d54c9fa744efc0572ae47c2a8f66fa2452
parent fdd1ecd9ad369521107265232e31182389ced3b3

LegacyState does not send notifyDisplayInfoChanged am: 545dd7778c am: 6acc0754d3 am: fdd1ecd9ad

Change-Id: I562ed784b6027ad85351f11095503a0268b59a7b

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

diff --git a/src/java/com/android/internal/telephony/NetworkTypeController.java b/src/java/com/android/internal/telephony/NetworkTypeController.java
index e3e2172..4c28b3d 100644
--- a/src/java/com/android/internal/telephony/NetworkTypeController.java
+++ b/src/java/com/android/internal/telephony/NetworkTypeController.java
@@ -500,6 +500,8 @@
                         transitionTo(mNrConnectedState);
                     } else if (isLte(rat) && isNrNotRestricted()) {
                         transitionWithTimerTo(isDataActive() ? mLteConnectedState : mIdleState);
+                    } else {
+                        updateOverrideNetworkType();
                     }
                     break;
                 case EVENT_NR_STATE_CHANGED:

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

diff --git a/src/java/com/android/internal/telephony/TelephonyTester.java b/src/java/com/android/internal/telephony/TelephonyTester.java
index 5e9a621..e1ada1d 100644
--- a/src/java/com/android/internal/telephony/TelephonyTester.java
+++ b/src/java/com/android/internal/telephony/TelephonyTester.java
@@ -144,6 +144,7 @@
     private static final String EXTRA_NR_FREQUENCY_RANGE = "nr_frequency_range";
     private static final String EXTRA_NR_STATE = "nr_state";
     private static final String EXTRA_OPERATOR = "operator";
+    private static final String EXTRA_OPERATOR_RAW = "operator_raw";
 
     private static final String ACTION_RESET = "reset";
 
@@ -403,6 +404,12 @@
             ss.setOperatorName(operator, operator, "");
             log("Override operator with " + operator);
         }
+        if (mServiceStateTestIntent.hasExtra(EXTRA_OPERATOR_RAW)) {
+            String operator_raw = mServiceStateTestIntent.getStringExtra(EXTRA_OPERATOR_RAW);
+            ss.setOperatorAlphaLongRaw(operator_raw);
+            ss.setOperatorAlphaShortRaw(operator_raw);
+            log("Override operator_raw with " + operator_raw);
+        }
         if (mServiceStateTestIntent.hasExtra(EXTRA_NR_FREQUENCY_RANGE)) {
             ss.setNrFrequencyRange(mServiceStateTestIntent.getIntExtra(EXTRA_NR_FREQUENCY_RANGE,
                     ServiceState.FREQUENCY_RANGE_UNKNOWN));