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

Commit edafe4c2 authored by Ling Ma's avatar Ling Ma Committed by Automerger Merge Worker
Browse files

Merge "Don't tear down PDN on PS_RESTRICT_ENABLED" into tm-dev am: 3c6f9a30 

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



Change-Id: Icb6decfbfd34e3ce4c07ec10eec983def137f68b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a0756efe 3c6f9a30

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

+1 −5
Original line number Diff line number Diff line
@@ -260,7 +260,6 @@ public class DataNetwork extends StateMachine { 
                    TEAR_DOWN_REASON_RAT_NOT_ALLOWED,

                    TEAR_DOWN_REASON_ROAMING_DISABLED,

                    TEAR_DOWN_REASON_CONCURRENT_VOICE_DATA_NOT_ALLOWED,

                    TEAR_DOWN_REASON_DATA_RESTRICTED_BY_NETWORK,

                    TEAR_DOWN_REASON_DATA_SERVICE_NOT_READY,

                    TEAR_DOWN_REASON_POWER_OFF_BY_CARRIER,

                    TEAR_DOWN_REASON_DATA_STALL,
@@ -308,8 +307,7 @@ public class DataNetwork extends StateMachine { 
    /** Data network tear down due to concurrent voice/data not allowed. */

    public static final int TEAR_DOWN_REASON_CONCURRENT_VOICE_DATA_NOT_ALLOWED = 8;



    /** Data network tear down due to network restricted. */

    public static final int TEAR_DOWN_REASON_DATA_RESTRICTED_BY_NETWORK = 9;





    /** Data network tear down due to data service unbound. */

    public static final int TEAR_DOWN_REASON_DATA_SERVICE_NOT_READY = 10;
@@ -3169,8 +3167,6 @@ public class DataNetwork extends StateMachine { 
                return "TEAR_DOWN_REASON_ROAMING_DISABLED";

            case TEAR_DOWN_REASON_CONCURRENT_VOICE_DATA_NOT_ALLOWED:

                return "TEAR_DOWN_REASON_CONCURRENT_VOICE_DATA_NOT_ALLOWED";

            case TEAR_DOWN_REASON_DATA_RESTRICTED_BY_NETWORK:

                return "TEAR_DOWN_REASON_DATA_RESTRICTED_BY_NETWORK";

            case TEAR_DOWN_REASON_DATA_SERVICE_NOT_READY:

                return "TEAR_DOWN_REASON_DATA_SERVICE_NOT_READY";

            case TEAR_DOWN_REASON_POWER_OFF_BY_CARRIER:

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

+0 −9
Original line number Diff line number Diff line
@@ -1046,8 +1046,6 @@ public class DataNetworkController extends Handler { 
                break;

            case EVENT_PS_RESTRICT_ENABLED:

                mPsRestricted = true;

                sendMessage(obtainMessage(EVENT_REEVALUATE_EXISTING_DATA_NETWORKS,

                        DataEvaluationReason.DATA_RESTRICTED_CHANGED));

                break;

            case EVENT_PS_RESTRICT_DISABLED:

                mPsRestricted = false;
@@ -1626,11 +1624,6 @@ public class DataNetworkController extends Handler { 
            evaluation.addDataDisallowedReason(DataDisallowedReason.SIM_NOT_READY);

        }



        // Check if data is restricted by the network.

        if (mPsRestricted) {

            evaluation.addDataDisallowedReason(DataDisallowedReason.DATA_RESTRICTED_BY_NETWORK);

        }



        // Check if device is in CDMA ECBM

        if (mPhone.isInCdmaEcm()) {

            evaluation.addDataDisallowedReason(DataDisallowedReason.CDMA_EMERGENCY_CALLBACK_MODE);
@@ -1901,8 +1894,6 @@ public class DataNetworkController extends Handler { 
                    return DataNetwork.TEAR_DOWN_REASON_SIM_REMOVAL;

                case CONCURRENT_VOICE_DATA_NOT_ALLOWED:

                    return DataNetwork.TEAR_DOWN_REASON_CONCURRENT_VOICE_DATA_NOT_ALLOWED;

                case DATA_RESTRICTED_BY_NETWORK:

                    return DataNetwork.TEAR_DOWN_REASON_DATA_RESTRICTED_BY_NETWORK;

                case RADIO_POWER_OFF:

                    return DataNetwork.TEAR_DOWN_REASON_AIRPLANE_MODE_ON;

                case PENDING_TEAR_DOWN_ALL:

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

+18 −5
Original line number Diff line number Diff line
@@ -1119,19 +1119,32 @@ public class DataNetworkControllerTest extends TelephonyTest { 
        testSetupDataNetwork();

        Mockito.clearInvocations(mMockedDataNetworkControllerCallback);



        // PS restricted.

        // PS restricted, existing PDN should stay.

        mDataNetworkControllerUT.obtainMessage(6/*EVENT_PS_RESTRICT_ENABLED*/).sendToTarget();

        processAllMessages();



        List<DataNetwork> dataNetworkList = getDataNetworks();

        assertThat(dataNetworkList).isEmpty();

        verify(mMockedDataNetworkControllerCallback).onInternetDataNetworkDisconnected();

        assertThat(dataNetworkList).hasSize(1);

        verifyConnectedNetworkHasCapabilities(NetworkCapabilities.NET_CAPABILITY_INTERNET);



        // PS unrestricted.

        // PS restricted, new setup NOT allowed

        mDataNetworkControllerUT.addNetworkRequest(

                createNetworkRequest(NetworkCapabilities.NET_CAPABILITY_IMS,

                        NetworkCapabilities.NET_CAPABILITY_MMTEL));

        setSuccessfulSetupDataResponse(mMockedDataServiceManagers

                .get(AccessNetworkConstants.TRANSPORT_TYPE_WWAN), 2);

        processAllMessages();

        verifyNoConnectedNetworkHasCapability(NetworkCapabilities.NET_CAPABILITY_IMS);

        verifyConnectedNetworkHasCapabilities(NetworkCapabilities.NET_CAPABILITY_INTERNET);





        // PS unrestricted, new setup is allowed

        mDataNetworkControllerUT.obtainMessage(7/*EVENT_PS_RESTRICT_DISABLED*/).sendToTarget();

        processAllMessages();



        verifyInternetConnected();

        verifyConnectedNetworkHasCapabilities(NetworkCapabilities.NET_CAPABILITY_IMS,

                NetworkCapabilities.NET_CAPABILITY_MMTEL);

        verifyConnectedNetworkHasCapabilities(NetworkCapabilities.NET_CAPABILITY_INTERNET);

    }



    @Test