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

Commit dfe9d235 authored by Hui Wang's avatar Hui Wang Committed by Automerger Merge Worker
Browse files

Merge "Transit to inactive state when starting handover failed" into sc-dev... 

Merge "Transit to inactive state when starting handover failed" into sc-dev am: 045d1deb am: d4d2314f

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

Change-Id: I8b1bd174b2364aa72fa63ba0ecf10482b6bbe97a
parents f5fb4e94 d4d2314f

src/java/com/android/internal/telephony/dataconnection/DataConnection.java

+13 −6
Original line number Diff line number Diff line
@@ -1017,6 +1017,12 @@ public class DataConnection extends StateMachine { 
        }

    }



    private void onRquestHandoverFailed(ConnectionParams cp) {

        sendMessage(obtainMessage(EVENT_CANCEL_HANDOVER));

        notifyConnectCompleted(cp, DataFailCause.UNKNOWN,

                    DataCallResponse.HANDOVER_FAILURE_MODE_UNKNOWN, false);

    }



    private void requestHandover(boolean inCorrectState, DataConnection srcDc,

            @DataServiceCallback.ResultCode int resultCode,

            ConnectionParams cp, Message msg, DataProfile dp, boolean isModemRoaming,
@@ -1034,8 +1040,7 @@ public class DataConnection extends StateMachine { 
                            + "srcdc = null");

                }

            }

            notifyConnectCompleted(cp, DataFailCause.UNKNOWN,

                    DataCallResponse.HANDOVER_FAILURE_MODE_UNKNOWN, false);

            onRquestHandoverFailed(cp);

            return;

        } else if (!isResultCodeSuccess(resultCode)) {

            if (DBG) {
@@ -1043,8 +1048,7 @@ public class DataConnection extends StateMachine { 
                        + "setupDataCall will not be called, result code = "

                        + DataServiceCallback.resultCodeToString(resultCode));

            }

            notifyConnectCompleted(cp, DataFailCause.UNKNOWN,

                    DataCallResponse.HANDOVER_FAILURE_MODE_UNKNOWN, false);

            onRquestHandoverFailed(cp);

            return;

        }
@@ -1069,8 +1073,7 @@ public class DataConnection extends StateMachine { 
        if (linkProperties == null || linkProperties.getLinkAddresses().isEmpty()) {

            loge("requestHandover: Can't find link properties of handover data connection. dc="

                    + srcDc);

            notifyConnectCompleted(cp, DataFailCause.UNKNOWN,

                    DataCallResponse.HANDOVER_FAILURE_MODE_UNKNOWN, false);

            onRquestHandoverFailed(cp);

            return;

        }
@@ -2752,6 +2755,10 @@ public class DataConnection extends StateMachine { 
                    ((Consumer<Boolean>) msg.obj).accept(true /* is in correct state*/);

                    retVal = HANDLED;

                    break;

                case EVENT_CANCEL_HANDOVER:

                    transitionTo(mInactiveState);

                    retVal = HANDLED;

                    break;

                default:

                    if (VDBG) {

                        log("DcActivatingState not handled msg.what=" +