commit 545dd7778c3b6f679b437509b3840f85b48b7403
author SongFerngWang <songferngwang@google.com> Thu May 14 22:23:34 2020 +0800
committer SongFerng Wang <songferngwang@google.com> Thu May 14 14:30:44 2020 +0000
tree 2c4165c5262f08f890c9de06a305c354cde673cb
parent 256a392f59b2ec6171d502de4d3b9625a16cf3ea

LegacyState does not send notifyDisplayInfoChanged

1. LegacyState add the updateOverrideNetworkType
when EVENT_DATA_RAT_CHANGED
2. TelephonyTester add operator_raw case

Bug: 156463826
Test: adb shell am broadcast -a \
com.android.internal.telephony.TestServiceState --ei \
data_rat 14 --ei nr_state 0 --ei nr_frequency_range 0 --es operator_raw\
 "AT\&T\\.\\.\\.1"

Change-Id: Ife70786f426a884a3d935b509ebc9f75377c00bc

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