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

Commit 19584153 authored by Aishwarya Mallamapti's avatar Aishwarya Mallamapti
Browse files

Replace SATELLITE_ENABLED with SERVICE_OPTION_NOT_SUPPORTED 

Bug: 287114765
Test: Flashed build on raven-userdebug and performed basic functionality
tests,
atest DataNetworkControllerTest

Change-Id: I9009ef01930767acdf9606fd02f0bd477d532bd2
parent 0f7416f2

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

+2 −2
Original line number Diff line number Diff line
@@ -290,8 +290,8 @@ public class DataEvaluation { 
        SIM_NOT_READY(true),

        /** Concurrent voice and data is not allowed. */

        CONCURRENT_VOICE_DATA_NOT_ALLOWED(true),

        /** Indicates that data is not allowed as device is connected to satellite. */

        SATELLITE_ENABLED(true),

        /** Service option not supported. */

        SERVICE_OPTION_NOT_SUPPORTED(true),

        /** Carrier notified data should be restricted. */

        DATA_RESTRICTED_BY_NETWORK(true),

        /** Radio power is off (i.e. airplane mode on) */

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

+5 −5
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ 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_SATELLITE_ENABLED,

                    TEAR_DOWN_REASON_SERVICE_OPTION_NOT_SUPPORTED,

                    TEAR_DOWN_REASON_DATA_SERVICE_NOT_READY,

                    TEAR_DOWN_REASON_POWER_OFF_BY_CARRIER,

                    TEAR_DOWN_REASON_DATA_STALL,
@@ -331,8 +331,8 @@ 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 device is connected to satellite. */

    public static final int TEAR_DOWN_REASON_SATELLITE_ENABLED = 9;

    /** Data network tear down due to service option is not supported. */

    public static final int TEAR_DOWN_REASON_SERVICE_OPTION_NOT_SUPPORTED = 9;



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

    public static final int TEAR_DOWN_REASON_DATA_SERVICE_NOT_READY = 10;
@@ -3491,8 +3491,8 @@ 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_SATELLITE_ENABLED:

                return "TEAR_DOWN_REASON_SATELLITE_ENABLED";

            case TEAR_DOWN_REASON_SERVICE_OPTION_NOT_SUPPORTED:

                return "TEAR_DOWN_REASON_SERVICE_OPTION_NOT_SUPPORTED";

            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

+4 −4
Original line number Diff line number Diff line
@@ -1554,7 +1554,7 @@ public class DataNetworkController extends Handler { 


        // Check whether data is disallowed while using satellite

        if (isDataDisallowedDueToSatellite(networkRequest.getCapabilities())) {

            evaluation.addDataDisallowedReason(DataDisallowedReason.SATELLITE_ENABLED);

            evaluation.addDataDisallowedReason(DataDisallowedReason.SERVICE_OPTION_NOT_SUPPORTED);

        }



        // Check if only one data network is allowed.
@@ -1737,7 +1737,7 @@ public class DataNetworkController extends Handler { 
        // Check whether data is disallowed while using satellite

        if (isDataDisallowedDueToSatellite(dataNetwork.getNetworkCapabilities()

                .getCapabilities())) {

            evaluation.addDataDisallowedReason(DataDisallowedReason.SATELLITE_ENABLED);

            evaluation.addDataDisallowedReason(DataDisallowedReason.SERVICE_OPTION_NOT_SUPPORTED);

        }



        // Check if there are other network that has higher priority, and only single data network
@@ -2091,8 +2091,8 @@ 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 SATELLITE_ENABLED:

                    return DataNetwork.TEAR_DOWN_REASON_SATELLITE_ENABLED;

                case SERVICE_OPTION_NOT_SUPPORTED:

                    return DataNetwork.TEAR_DOWN_REASON_SERVICE_OPTION_NOT_SUPPORTED;

                case RADIO_POWER_OFF:

                    return DataNetwork.TEAR_DOWN_REASON_AIRPLANE_MODE_ON;

                case PENDING_TEAR_DOWN_ALL: