Merge "NR advanced state check for NR SA" (4b8285d6) · Commits · e / os / android_frameworks_opt_telephony

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

+10 −7

Original line number	Diff line number	Diff line
		@@ -978,18 +978,21 @@ public class NetworkTypeController extends StateMachine {

		private void updateNrAdvancedState() {
		log("updateNrAdvancedState");
		if (!isNrConnected()) {
		if (!isNrConnected() && getDataNetworkType() != TelephonyManager.NETWORK_TYPE_NR) {
		log("NR state changed. Sending EVENT_NR_STATE_CHANGED");
		sendMessage(EVENT_NR_STATE_CHANGED);
		return;
		}
		if (!isNrAdvanced()) {
		boolean isNrAdvanced = isNrAdvanced();
		if (isNrAdvanced != mIsNrAdvanced) {
		if (!isNrAdvanced) {
		if (DBG) log("updateNrAdvancedState: CONNECTED_NR_ADVANCED -> CONNECTED");
		transitionWithTimerTo(mNrConnectedState);
		} else {
		if (DBG) log("updateNrAdvancedState: CONNECTED -> CONNECTED_NR_ADVANCED");
		transitionTo(mNrConnectedState);
		}
		}
		mIsNrAdvanced = isNrAdvanced();
		log("mIsNrAdvanced=" + mIsNrAdvanced);
		}