Merge "Add NR state change logic to data activity changed event" into rvc-dev am: 95ac639aaf (e80653a5) · Commits · e / os / android_frameworks_opt_telephony

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

+22 −6

Original line number	Diff line number	Diff line
		@@ -589,9 +589,15 @@ public class NetworkTypeController extends StateMachine {
		// ignore
		break;
		case EVENT_DATA_ACTIVITY_CHANGED:
		if (isNrNotRestricted()) {
		// NOT_RESTRICTED_RRC_IDLE -> NOT_RESTRICTED_RRC_CON
		if (isDataActive()) {
		transitionWithTimerTo(mLteConnectedState);
		}
		} else {
		log("NR state changed. Sending EVENT_NR_STATE_CHANGED");
		sendMessage(EVENT_NR_STATE_CHANGED);
		}
		break;
		default:
		return NOT_HANDLED;
		@@ -648,9 +654,15 @@ public class NetworkTypeController extends StateMachine {
		// ignore
		break;
		case EVENT_DATA_ACTIVITY_CHANGED:
		if (isNrNotRestricted()) {
		// NOT_RESTRICTED_RRC_CON -> NOT_RESTRICTED_RRC_IDLE
		if (!isDataActive()) {
		transitionWithTimerTo(mIdleState);
		}
		} else {
		log("NR state changed. Sending EVENT_NR_STATE_CHANGED");
		sendMessage(EVENT_NR_STATE_CHANGED);
		}
		break;
		default:
		return NOT_HANDLED;
		@@ -707,8 +719,9 @@ public class NetworkTypeController extends StateMachine {
		break;
		case EVENT_NR_FREQUENCY_CHANGED:
		if (!isNrConnected()) {
		log("The nr state was changed. To update the state.");
		log("NR state changed. Sending EVENT_NR_STATE_CHANGED");
		sendMessage(EVENT_NR_STATE_CHANGED);
		break;
		}
		if (!isNrMmwave()) {
		// STATE_CONNECTED_MMWAVE -> STATE_CONNECTED
		@@ -719,7 +732,10 @@ public class NetworkTypeController extends StateMachine {
		}
		break;
		case EVENT_DATA_ACTIVITY_CHANGED:
		// ignore
		if (!isNrConnected()) {
		log("NR state changed. Sending EVENT_NR_STATE_CHANGED");
		sendMessage(EVENT_NR_STATE_CHANGED);
		}
		break;
		default:
		return NOT_HANDLED;