Merge "LegacyState does not send notifyDisplayInfoChanged" am: 92250a6488 (e69a404c) · Commits · e / os / android_frameworks_opt_telephony

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -505,6 +505,8 @@ public class NetworkTypeController extends StateMachine {
		transitionTo(mNrConnectedState);
		} else if (isLte(rat) && isNrNotRestricted()) {
		transitionWithTimerTo(isDataActive() ? mLteConnectedState : mIdleState);
		} else {
		updateOverrideNetworkType();
		}
		break;
		case EVENT_NR_STATE_CHANGED:

+7 −0

Original line number	Diff line number	Diff line
		@@ -144,6 +144,7 @@ public class TelephonyTester {
		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 @@ public class TelephonyTester {
		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));