Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 256de851 authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Add NR state change logic to data activity changed event" am: 25cc8767 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1347690

Change-Id: I562da93419245da696d19508f04b2e98eafe8a31
parents 50cf3721 25cc8767

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

+22 −6
Original line number Diff line number Diff line
@@ -599,9 +599,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;
@@ -658,9 +664,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;
@@ -720,8 +732,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
@@ -733,7 +746,10 @@ public class NetworkTypeController extends StateMachine { 
                    mIsNrMmwave = isNrMmwave();

                    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;