diff options
-rw-r--r-- | src/java/com/android/internal/telephony/NetworkTypeController.java | 24 | ||||
-rw-r--r-- | tests/telephonytests/src/com/android/internal/telephony/NetworkTypeControllerTest.java | 22 |
2 files changed, 19 insertions, 27 deletions
diff --git a/src/java/com/android/internal/telephony/NetworkTypeController.java b/src/java/com/android/internal/telephony/NetworkTypeController.java index deb8427385..b9ad388bbf 100644 --- a/src/java/com/android/internal/telephony/NetworkTypeController.java +++ b/src/java/com/android/internal/telephony/NetworkTypeController.java @@ -184,8 +184,7 @@ public class NetworkTypeController extends StateMachine { @Override public void onPhysicalLinkStatusChanged(@LinkStatus int status) { if (isUsingPhysicalChannelConfigForRrcDetection()) return; - sendMessage(obtainMessage(EVENT_PHYSICAL_LINK_STATUS_CHANGED, - new AsyncResult(null, status, null))); + sendMessage(obtainMessage(EVENT_PHYSICAL_LINK_STATUS_CHANGED, status)); } }; @@ -635,8 +634,7 @@ public class NetworkTypeController extends StateMachine { transitionToCurrentState(); break; case EVENT_PHYSICAL_LINK_STATUS_CHANGED: - ar = (AsyncResult) msg.obj; - mPhysicalLinkStatus = (int) ar.result; + mPhysicalLinkStatus = msg.arg1; break; case EVENT_PHYSICAL_CHANNEL_CONFIG_NOTIF_CHANGED: ar = (AsyncResult) msg.obj; @@ -797,8 +795,7 @@ public class NetworkTypeController extends StateMachine { } break; case EVENT_PHYSICAL_LINK_STATUS_CHANGED: - ar = (AsyncResult) msg.obj; - mPhysicalLinkStatus = (int) ar.result; + mPhysicalLinkStatus = msg.arg1; if (mIsTimerResetEnabledForLegacyStateRrcIdle && !isPhysicalLinkActive()) { if (DBG) log("Reset timers since timer reset is enabled for RRC idle."); resetAllTimers(); @@ -881,8 +878,7 @@ public class NetworkTypeController extends StateMachine { } break; case EVENT_PHYSICAL_LINK_STATUS_CHANGED: - ar = (AsyncResult) msg.obj; - mPhysicalLinkStatus = (int) ar.result; + mPhysicalLinkStatus = msg.arg1; if (isPhysicalLinkActive()) { transitionWithTimerTo(mLteConnectedState); } else { @@ -966,8 +962,7 @@ public class NetworkTypeController extends StateMachine { } break; case EVENT_PHYSICAL_LINK_STATUS_CHANGED: - ar = (AsyncResult) msg.obj; - mPhysicalLinkStatus = (int) ar.result; + mPhysicalLinkStatus = msg.arg1; if (!isPhysicalLinkActive()) { transitionWithTimerTo(mIdleState); } else { @@ -1048,8 +1043,7 @@ public class NetworkTypeController extends StateMachine { } break; case EVENT_PHYSICAL_LINK_STATUS_CHANGED: - ar = (AsyncResult) msg.obj; - mPhysicalLinkStatus = (int) ar.result; + mPhysicalLinkStatus = msg.arg1; if (isPhysicalLinkActive()) { transitionWithTimerTo(mNrConnectedState); } @@ -1127,8 +1121,7 @@ public class NetworkTypeController extends StateMachine { } break; case EVENT_PHYSICAL_LINK_STATUS_CHANGED: - ar = (AsyncResult) msg.obj; - mPhysicalLinkStatus = (int) ar.result; + mPhysicalLinkStatus = msg.arg1; if (!isPhysicalLinkActive() && mFeatureFlags.supportNrSaRrcIdle()) { transitionWithTimerTo(mNrIdleState); } @@ -1218,8 +1211,7 @@ public class NetworkTypeController extends StateMachine { } break; case EVENT_PHYSICAL_LINK_STATUS_CHANGED: - ar = (AsyncResult) msg.obj; - mPhysicalLinkStatus = (int) ar.result; + mPhysicalLinkStatus = msg.arg1; break; default: return NOT_HANDLED; diff --git a/tests/telephonytests/src/com/android/internal/telephony/NetworkTypeControllerTest.java b/tests/telephonytests/src/com/android/internal/telephony/NetworkTypeControllerTest.java index 0ab3c0ecfb..1ea989a98f 100644 --- a/tests/telephonytests/src/com/android/internal/telephony/NetworkTypeControllerTest.java +++ b/tests/telephonytests/src/com/android/internal/telephony/NetworkTypeControllerTest.java @@ -273,7 +273,7 @@ public class NetworkTypeControllerTest extends TelephonyTest { assertEquals("DefaultState", getCurrentState().getName()); doReturn(NetworkRegistrationInfo.NR_STATE_NOT_RESTRICTED).when(mServiceState).getNrState(); mNetworkTypeController.sendMessage(4 /* EVENT_PHYSICAL_LINK_STATUS_CHANGED */, - new AsyncResult(null, DataCallResponse.LINK_STATUS_DORMANT, null)); + DataCallResponse.LINK_STATUS_DORMANT); mNetworkTypeController.sendMessage(3 /* EVENT_SERVICE_STATE_CHANGED */); processAllMessages(); assertEquals("not_restricted_rrc_idle", getCurrentState().getName()); @@ -312,7 +312,7 @@ public class NetworkTypeControllerTest extends TelephonyTest { doReturn(NetworkRegistrationInfo.NR_STATE_NOT_RESTRICTED).when(mServiceState).getNrState(); mNetworkTypeController.sendMessage(4 /* EVENT_PHYSICAL_LINK_STATUS_CHANGED */, - new AsyncResult(null, DataCallResponse.LINK_STATUS_DORMANT, null)); + DataCallResponse.LINK_STATUS_DORMANT); mNetworkTypeController.sendMessage(3 /* EVENT_SERVICE_STATE_CHANGED */); processAllMessages(); assertEquals("not_restricted_rrc_idle", getCurrentState().getName()); @@ -323,7 +323,7 @@ public class NetworkTypeControllerTest extends TelephonyTest { assertEquals("DefaultState", getCurrentState().getName()); doReturn(NetworkRegistrationInfo.NR_STATE_NOT_RESTRICTED).when(mServiceState).getNrState(); mNetworkTypeController.sendMessage(4 /* EVENT_PHYSICAL_LINK_STATUS_CHANGED */, - new AsyncResult(null, DataCallResponse.LINK_STATUS_ACTIVE, null)); + DataCallResponse.LINK_STATUS_ACTIVE); mNetworkTypeController.sendMessage(3 /* EVENT_SERVICE_STATE_CHANGED */); processAllMessages(); assertEquals("not_restricted_rrc_con", getCurrentState().getName()); @@ -365,7 +365,7 @@ public class NetworkTypeControllerTest extends TelephonyTest { doReturn(NetworkRegistrationInfo.NR_STATE_NOT_RESTRICTED).when(mServiceState).getNrState(); mNetworkTypeController.sendMessage(4 /* EVENT_PHYSICAL_LINK_STATUS_CHANGED */, - new AsyncResult(null, DataCallResponse.LINK_STATUS_ACTIVE, null)); + DataCallResponse.LINK_STATUS_ACTIVE); mNetworkTypeController.sendMessage(3 /* EVENT_SERVICE_STATE_CHANGED */); processAllMessages(); assertEquals("not_restricted_rrc_con", getCurrentState().getName()); @@ -772,7 +772,7 @@ public class NetworkTypeControllerTest extends TelephonyTest { doReturn(NetworkRegistrationInfo.NR_STATE_NOT_RESTRICTED).when(mServiceState).getNrState(); mNetworkTypeController.sendMessage(4 /* EVENT_PHYSICAL_LINK_STATUS_CHANGED */, - new AsyncResult(null, DataCallResponse.LINK_STATUS_ACTIVE, null)); + DataCallResponse.LINK_STATUS_ACTIVE); mNetworkTypeController.sendMessage(3 /* EVENT_SERVICE_STATE_CHANGED */); processAllMessages(); assertEquals("not_restricted_rrc_con", getCurrentState().getName()); @@ -812,7 +812,7 @@ public class NetworkTypeControllerTest extends TelephonyTest { testTransitionToCurrentStateNrConnectedMmwave(); doReturn(NetworkRegistrationInfo.NR_STATE_NOT_RESTRICTED).when(mServiceState).getNrState(); mNetworkTypeController.sendMessage(4 /* EVENT_PHYSICAL_LINK_STATUS_CHANGED */, - new AsyncResult(null, DataCallResponse.LINK_STATUS_ACTIVE, null)); + DataCallResponse.LINK_STATUS_ACTIVE); mNetworkTypeController.sendMessage(3 /* EVENT_SERVICE_STATE_CHANGED */); processAllMessages(); @@ -848,7 +848,7 @@ public class NetworkTypeControllerTest extends TelephonyTest { // Transition to LTE connected state doReturn(NetworkRegistrationInfo.NR_STATE_NOT_RESTRICTED).when(mServiceState).getNrState(); mNetworkTypeController.sendMessage(4 /* EVENT_PHYSICAL_LINK_STATUS_CHANGED */, - new AsyncResult(null, DataCallResponse.LINK_STATUS_ACTIVE, null)); + DataCallResponse.LINK_STATUS_ACTIVE); mNetworkTypeController.sendMessage(3 /* EVENT_SERVICE_STATE_CHANGED */); processAllMessages(); assertEquals("not_restricted_rrc_con", getCurrentState().getName()); @@ -878,7 +878,7 @@ public class NetworkTypeControllerTest extends TelephonyTest { // Transition to idle state doReturn(NetworkRegistrationInfo.NR_STATE_NOT_RESTRICTED).when(mServiceState).getNrState(); mNetworkTypeController.sendMessage(4 /* EVENT_PHYSICAL_LINK_STATUS_CHANGED */, - new AsyncResult(null, DataCallResponse.LINK_STATUS_DORMANT, null)); + DataCallResponse.LINK_STATUS_DORMANT); mNetworkTypeController.sendMessage(3 /* EVENT_SERVICE_STATE_CHANGED */); processAllMessages(); assertEquals("not_restricted_rrc_idle", getCurrentState().getName()); @@ -902,7 +902,7 @@ public class NetworkTypeControllerTest extends TelephonyTest { testTransitionToCurrentStateLteConnected(); doReturn(ServiceState.FREQUENCY_RANGE_MMWAVE).when(mServiceState).getNrFrequencyRange(); mNetworkTypeController.sendMessage(4 /* EVENT_PHYSICAL_LINK_STATUS_CHANGED */, - new AsyncResult(null, DataCallResponse.LINK_STATUS_DORMANT, null)); + DataCallResponse.LINK_STATUS_DORMANT); processAllMessages(); assertEquals("not_restricted_rrc_idle", getCurrentState().getName()); @@ -941,7 +941,7 @@ public class NetworkTypeControllerTest extends TelephonyTest { testTransitionToCurrentStateLteConnected_usingUserDataForRrcDetection(); doReturn(ServiceState.FREQUENCY_RANGE_MMWAVE).when(mServiceState).getNrFrequencyRange(); mNetworkTypeController.sendMessage(4 /* EVENT_PHYSICAL_LINK_STATUS_CHANGED */, - new AsyncResult(null, DataCallResponse.LINK_STATUS_DORMANT, null)); + DataCallResponse.LINK_STATUS_DORMANT); processAllMessages(); assertEquals("not_restricted_rrc_idle", getCurrentState().getName()); @@ -1797,7 +1797,7 @@ public class NetworkTypeControllerTest extends TelephonyTest { doReturn(NetworkRegistrationInfo.NR_STATE_NOT_RESTRICTED).when(mServiceState).getNrState(); mNetworkTypeController.sendMessage(4 /* EVENT_PHYSICAL_LINK_STATUS_CHANGED */, - new AsyncResult(null, DataCallResponse.LINK_STATUS_ACTIVE, null)); + DataCallResponse.LINK_STATUS_ACTIVE); mNetworkTypeController.sendMessage(3 /* EVENT_SERVICE_STATE_CHANGED */); processAllMessages(); |