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

Commit 07adc995 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Defer dataCallList for source transport duing HO" am: 084275f6 am: 4eaba619 

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



Change-Id: Ifaa2d89e9ca207abdfbc1c3eda1fc10c71e7ca7b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ef2008d4 4eaba619

src/java/com/android/internal/telephony/data/DataNetwork.java

+9 −35
Original line number Diff line number Diff line
@@ -1409,8 +1409,15 @@ public class DataNetwork extends StateMachine { 
                    // Otherwise the deferred message might be incorrectly treated as "disconnected"

                    // signal. So we only defer the related data call list changed event, and drop

                    // the unrelated.

                    if (shouldDeferDataStateChangedEvent(msg)) {

                        log("Defer message " + eventToString(msg.what));

                    AsyncResult ar = (AsyncResult) msg.obj;

                    int transport = (int) ar.userObj;

                    List<DataCallResponse> responseList = (List<DataCallResponse>) ar.result;

                    if (transport != mTransport) {

                        log("Dropped unrelated "

                                + AccessNetworkConstants.transportTypeToString(transport)

                                + " data call list changed event. " + responseList);

                    } else {

                        log("Defer message " + eventToString(msg.what) + ":" + responseList);

                        deferMessage(msg);

                    }

                    break;
@@ -1457,39 +1464,6 @@ public class DataNetwork extends StateMachine { 
            }

            return HANDLED;

        }



        /**

         * Check if the data call list changed event should be deferred or dropped when handover

         * is in progress.

         *

         * @param msg The data call list changed message.

         *

         * @return {@code true} if the message should be deferred.

         */

        private boolean shouldDeferDataStateChangedEvent(@NonNull Message msg) {

            // The data call list changed event should be conditionally deferred.

            // Otherwise the deferred message might be incorrectly treated as "disconnected"

            // signal. So we only defer the related data call list changed event, and drop

            // the unrelated.

            AsyncResult ar = (AsyncResult) msg.obj;

            int transport = (int) ar.userObj;

            List<DataCallResponse> responseList = (List<DataCallResponse>) ar.result;

            if (transport != mTransport) {

                log("Dropped unrelated " + AccessNetworkConstants.transportTypeToString(transport)

                        + " data call list changed event. " + responseList);

                return false;

            }



            // Check if the data call list changed event are related to the current data network.

            boolean related = responseList.stream().anyMatch(

                    r -> mCid.get(mTransport) == r.getId());

            if (related) {

                log("Deferred the related data call list changed event." + responseList);

            } else {

                log("Dropped unrelated data call list changed event. " + responseList);

            }

            return related;

        }

    }



    /**

tests/telephonytests/src/com/android/internal/telephony/data/DataNetworkTest.java

+11 −0
Original line number Diff line number Diff line
@@ -1063,6 +1063,17 @@ public class DataNetworkTest extends TelephonyTest { 
        assertThat(pdcsList.get(3).getState()).isEqualTo(TelephonyManager.DATA_CONNECTED);

        assertThat(pdcsList.get(3).getLastCauseCode())

                .isEqualTo(DataFailCause.SERVICE_TEMPORARILY_UNAVAILABLE);



        // Test source PDN lost during the HO, expect tear down after HO

        setFailedSetupDataResponse(mMockedWlanDataServiceManager,

                DataServiceCallback.RESULT_ERROR_TEMPORARILY_UNAVAILABLE);

        mDataNetworkUT.startHandover(AccessNetworkConstants.TRANSPORT_TYPE_WLAN, null);

        mDataNetworkUT.sendMessage(8/*EVENT_DATA_STATE_CHANGED*/,

                new AsyncResult(AccessNetworkConstants.TRANSPORT_TYPE_WWAN,

                        Collections.emptyList(), null)); // the source transport report PDN lost

        processAllMessages();



        assertThat(mDataNetworkUT.isConnected()).isFalse();

    }



    @Test