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

Commit f5e02422 authored by Paul Hu's avatar Paul Hu
Browse files

Revert "Rename some failed causes" 

This reverts commit 1c405b73.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I4af7c87d8a8a988c2f1c3dc6662027c6fcd34088
parent 1c405b73

api/system-current.txt

+4 −4
Original line number Diff line number Diff line
@@ -5577,7 +5577,6 @@ package android.telephony { 
    field public static final int ACCESS_BLOCK_ALL = 2088; // 0x828

    field public static final int ACCESS_CLASS_DSAC_REJECTION = 2108; // 0x83c

    field public static final int ACCESS_CONTROL_LIST_CHECK_FAILURE = 2128; // 0x850

    field public static final int ACCESS_PROBE_LIMIT_REACHED = 2079; // 0x81f

    field public static final int ACTIVATION_REJECTED_BCM_VIOLATION = 48; // 0x30

    field public static final int ACTIVATION_REJECT_GGSN = 30; // 0x1e

    field public static final int ACTIVATION_REJECT_UNSPECIFIED = 31; // 0x1f
@@ -5692,9 +5691,7 @@ package android.telephony { 
    field public static final int INVALID_PRIMARY_NSAPI = 2158; // 0x86e

    field public static final int INVALID_SIM_STATE = 2224; // 0x8b0

    field public static final int INVALID_TRANSACTION_ID = 81; // 0x51

    field public static final int IPV4_CONNECTIONS_LIMIT_REACHED = 2052; // 0x804

    field public static final int IPV6_ADDRESS_TRANSFER_FAILED = 2047; // 0x7ff

    field public static final int IPV6_CONNECTIONS_LIMIT_REACHED = 2053; // 0x805

    field public static final int IPV6_PREFIX_UNAVAILABLE = 2250; // 0x8ca

    field public static final int IP_ADDRESS_MISMATCH = 119; // 0x77

    field public static final int IP_VERSION_MISMATCH = 2055; // 0x807
@@ -5713,6 +5710,10 @@ package android.telephony { 
    field public static final int MAC_FAILURE = 2183; // 0x887

    field public static final int MAXIMIUM_NSAPIS_EXCEEDED = 2157; // 0x86d

    field public static final int MAXINUM_SIZE_OF_L2_MESSAGE_EXCEEDED = 2166; // 0x876

    field public static final int MAX_ACCESS_PROBE = 2079; // 0x81f

    field public static final int MAX_IPV4_CONNECTIONS = 2052; // 0x804

    field public static final int MAX_IPV6_CONNECTIONS = 2053; // 0x805

    field public static final int MAX_PPP_INACTIVITY_TIMER_EXPIRED = 2046; // 0x7fe

    field public static final int MESSAGE_INCORRECT_SEMANTIC = 95; // 0x5f

    field public static final int MESSAGE_TYPE_UNSUPPORTED = 97; // 0x61

    field public static final int MIP_CONFIG_FAILURE = 2050; // 0x802
@@ -5821,7 +5822,6 @@ package android.telephony { 
    field public static final int PPP_AUTH_FAILURE = 2229; // 0x8b5

    field public static final int PPP_CHAP_FAILURE = 2232; // 0x8b8

    field public static final int PPP_CLOSE_IN_PROGRESS = 2233; // 0x8b9

    field public static final int PPP_INACTIVITY_TIMER_EXPIRED = 2046; // 0x7fe

    field public static final int PPP_OPTION_MISMATCH = 2230; // 0x8b6

    field public static final int PPP_PAP_FAILURE = 2231; // 0x8b7

    field public static final int PPP_TIMEOUT = 2228; // 0x8b4

telephony/java/android/telephony/DataFailCause.java

+13 −13
Original line number Diff line number Diff line
@@ -318,8 +318,8 @@ public final class DataFailCause { 
    public static final int LOW_POWER_MODE_OR_POWERING_DOWN = 0x7FC;

    /** APN has been disabled. */

    public static final int APN_DISABLED = 0x7FD;

    /** PPP inactivity timer expired. */

    public static final int PPP_INACTIVITY_TIMER_EXPIRED = 0x7FE;

    /** Maximum PPP inactivity timer expired. */

    public static final int MAX_PPP_INACTIVITY_TIMER_EXPIRED = 0x7FE;

    /** IPv6 address transfer failed. */

    public static final int IPV6_ADDRESS_TRANSFER_FAILED = 0x7FF;

    /** Target RAT swap failed. */
@@ -339,12 +339,12 @@ public final class DataFailCause { 
     * IPv4 data call bring up is rejected because the UE already maintains the allotted maximum

     * number of IPv4 data connections.

     */

    public static final int IPV4_CONNECTIONS_LIMIT_REACHED = 0x804;

    public static final int MAX_IPV4_CONNECTIONS = 0x804;

    /**

     * IPv6 data call bring up is rejected because the UE already maintains the allotted maximum

     * number of IPv6 data connections.

     */

    public static final int IPV6_CONNECTIONS_LIMIT_REACHED = 0x805;

    public static final int MAX_IPV6_CONNECTIONS = 0x805;

    /**

     * New PDN bring up is rejected during interface selection because the UE has already allotted

     * the available interfaces for other PDNs.
@@ -416,7 +416,7 @@ public final class DataFailCause { 
     */

    public static final int CHANNEL_ACQUISITION_FAILURE = 0x81E;

    /** Maximum access probes transmitted. */

    public static final int ACCESS_PROBE_LIMIT_REACHED = 0x81F;

    public static final int MAX_ACCESS_PROBE = 0x81F;

    /** Concurrent service is not supported by base station. */

    public static final int CONCURRENT_SERVICE_NOT_SUPPORTED_BY_BASE_STATION = 0x820;

    /** There was no response received from the base station. */
@@ -1079,14 +1079,14 @@ public final class DataFailCause { 
            SIM_CARD_CHANGED,

            LOW_POWER_MODE_OR_POWERING_DOWN,

            APN_DISABLED,

            PPP_INACTIVITY_TIMER_EXPIRED,

            MAX_PPP_INACTIVITY_TIMER_EXPIRED,

            IPV6_ADDRESS_TRANSFER_FAILED,

            TRAT_SWAP_FAILED,

            EHRPD_TO_HRPD_FALLBACK,

            MIP_CONFIG_FAILURE,

            PDN_INACTIVITY_TIMER_EXPIRED,

            IPV4_CONNECTIONS_LIMIT_REACHED,

            IPV6_CONNECTIONS_LIMIT_REACHED,

            MAX_IPV4_CONNECTIONS,

            MAX_IPV6_CONNECTIONS,

            APN_MISMATCH,

            IP_VERSION_MISMATCH,

            DUN_CALL_DISALLOWED,
@@ -1112,7 +1112,7 @@ public final class DataFailCause { 
            CDMA_INCOMING_CALL,

            CDMA_ALERT_STOP,

            CHANNEL_ACQUISITION_FAILURE,

            ACCESS_PROBE_LIMIT_REACHED,

            MAX_ACCESS_PROBE,

            CONCURRENT_SERVICE_NOT_SUPPORTED_BY_BASE_STATION,

            NO_RESPONSE_FROM_BASE_STATION,

            REJECTED_BY_BASE_STATION,
@@ -1447,14 +1447,14 @@ public final class DataFailCause { 
        sFailCauseMap.put(SIM_CARD_CHANGED, "SIM_CARD_CHANGED");

        sFailCauseMap.put(LOW_POWER_MODE_OR_POWERING_DOWN, "LOW_POWER_MODE_OR_POWERING_DOWN");

        sFailCauseMap.put(APN_DISABLED, "APN_DISABLED");

        sFailCauseMap.put(PPP_INACTIVITY_TIMER_EXPIRED, "PPP_INACTIVITY_TIMER_EXPIRED");

        sFailCauseMap.put(MAX_PPP_INACTIVITY_TIMER_EXPIRED, "MAX_PPP_INACTIVITY_TIMER_EXPIRED");

        sFailCauseMap.put(IPV6_ADDRESS_TRANSFER_FAILED, "IPV6_ADDRESS_TRANSFER_FAILED");

        sFailCauseMap.put(TRAT_SWAP_FAILED, "TRAT_SWAP_FAILED");

        sFailCauseMap.put(EHRPD_TO_HRPD_FALLBACK, "EHRPD_TO_HRPD_FALLBACK");

        sFailCauseMap.put(MIP_CONFIG_FAILURE, "MIP_CONFIG_FAILURE");

        sFailCauseMap.put(PDN_INACTIVITY_TIMER_EXPIRED, "PDN_INACTIVITY_TIMER_EXPIRED");

        sFailCauseMap.put(IPV4_CONNECTIONS_LIMIT_REACHED, "IPV4_CONNECTIONS_LIMIT_REACHED");

        sFailCauseMap.put(IPV6_CONNECTIONS_LIMIT_REACHED, "IPV6_CONNECTIONS_LIMIT_REACHED");

        sFailCauseMap.put(MAX_IPV4_CONNECTIONS, "MAX_IPV4_CONNECTIONS");

        sFailCauseMap.put(MAX_IPV6_CONNECTIONS, "MAX_IPV6_CONNECTIONS");

        sFailCauseMap.put(APN_MISMATCH, "APN_MISMATCH");

        sFailCauseMap.put(IP_VERSION_MISMATCH, "IP_VERSION_MISMATCH");

        sFailCauseMap.put(DUN_CALL_DISALLOWED, "DUN_CALL_DISALLOWED");
@@ -1480,7 +1480,7 @@ public final class DataFailCause { 
        sFailCauseMap.put(CDMA_INCOMING_CALL, "CDMA_INCOMING_CALL");

        sFailCauseMap.put(CDMA_ALERT_STOP, "CDMA_ALERT_STOP");

        sFailCauseMap.put(CHANNEL_ACQUISITION_FAILURE, "CHANNEL_ACQUISITION_FAILURE");

        sFailCauseMap.put(ACCESS_PROBE_LIMIT_REACHED, "ACCESS_PROBE_LIMIT_REACHED");

        sFailCauseMap.put(MAX_ACCESS_PROBE, "MAX_ACCESS_PROBE");

        sFailCauseMap.put(CONCURRENT_SERVICE_NOT_SUPPORTED_BY_BASE_STATION,

                "CONCURRENT_SERVICE_NOT_SUPPORTED_BY_BASE_STATION");

        sFailCauseMap.put(NO_RESPONSE_FROM_BASE_STATION, "NO_RESPONSE_FROM_BASE_STATION");