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

Commit f59ac3ca authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Clean up handover complete message in handover retry case am: c1abb88d am: 81495964 

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

Change-Id: Ic276b866b907f09deb98ada784b24cd9371b032c
parents 6c571b52 81495964

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

+24 −11
Original line number Diff line number Diff line
@@ -2532,6 +2532,19 @@ public class DcTracker extends Handler { 
        }

    }



    private void sendRequestNetworkCompleteMessages(@ApnType int apnType,

            @RequestNetworkType int requestType, boolean success,

            boolean fallbackOnFailedHandover) {

        List<Message> messageList = mRequestNetworkCompletionMsgs.get(apnType);

        if (messageList != null) {

            for (Message msg : messageList) {

                sendRequestNetworkCompleteMsg(msg, success, mTransportType, requestType,

                        fallbackOnFailedHandover);

            }

            messageList.clear();

        }

    }



    private void sendRequestNetworkCompleteMsg(Message message, boolean success,

                                               @TransportType int transport,

                                               @RequestNetworkType int requestType,
@@ -2960,16 +2973,9 @@ public class DcTracker extends Handler { 
                    + DataCallResponse.failureModeToString(handoverFailureMode));

        } else if (handoverFailureMode

                != DataCallResponse.HANDOVER_FAILURE_MODE_NO_FALLBACK_RETRY_HANDOVER) {

            int apnType = ApnSetting.getApnTypesBitmaskFromString(apnContext.getApnType());

            List<Message> messageList = mRequestNetworkCompletionMsgs.get(apnType);

            if (messageList != null) {

                for (Message msg : messageList) {

                    sendRequestNetworkCompleteMsg(msg, success, mTransportType, requestType,

            sendRequestNetworkCompleteMessages(apnContext.getApnTypeBitmask(), requestType, success,

                    fallbackOnFailedHandover);

        }

                messageList.clear();

            }

        }



        if (success) {

            DataConnection dataConnection = apnContext.getDataConnection();
@@ -3753,9 +3759,16 @@ public class DcTracker extends Handler { 
                break;



            case DctConstants.EVENT_TRY_SETUP_DATA:

                trySetupData((ApnContext) msg.obj, msg.arg1);

                apnContext = (ApnContext) msg.obj;

                requestType = msg.arg1;

                if (!trySetupData(apnContext, requestType)) {

                    // Note that this might be a retry handover request that we need to notify

                    // handover completion. Note if it fails, we will not retry anymore (because

                    // it's due to pre-condition not met) and will not fallback.

                    sendRequestNetworkCompleteMessages(apnContext.getApnTypeBitmask(), requestType,

                            false, false);

                }

                break;



            case DctConstants.EVENT_CLEAN_UP_CONNECTION:

                if (DBG) log("EVENT_CLEAN_UP_CONNECTION");

                cleanUpConnectionInternal(true, RELEASE_TYPE_DETACH, (ApnContext) msg.obj);