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

Commit 30eb433a authored by Aswin Sankar's avatar Aswin Sankar Committed by Gerrit Code Review
Browse files

Merge "IWLAN DataFailCause for unexpected tunnel state"

parents 026325fe 61b41238

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -42302,6 +42302,7 @@ package android.telephony { 
    field public static final int IWLAN_SEMANTIC_ERROR_IN_THE_TFT_OPERATION = 8241; // 0x2031

    field public static final int IWLAN_SYNTACTICAL_ERRORS_IN_PACKET_FILTERS = 8245; // 0x2035

    field public static final int IWLAN_SYNTACTICAL_ERROR_IN_THE_TFT_OPERATION = 8242; // 0x2032

    field public static final int IWLAN_TUNNEL_NOT_FOUND = 16390; // 0x4006

    field public static final int IWLAN_UNAUTHENTICATED_EMERGENCY_NOT_SUPPORTED = 11055; // 0x2b2f

    field public static final int IWLAN_USER_UNKNOWN = 9001; // 0x2329

    field public static final int LIMITED_TO_IPV4 = 2234; // 0x8ba

telephony/java/android/telephony/DataFailCause.java

+3 −0
Original line number Diff line number Diff line
@@ -1012,6 +1012,8 @@ public final class DataFailCause { 
    public static final int IWLAN_DNS_RESOLUTION_NAME_FAILURE = 0x4004;

    /** No response received from the DNS Server due to a timeout*/

    public static final int IWLAN_DNS_RESOLUTION_TIMEOUT = 0x4005;

    /** Expected to update or bring down an ePDG tunnel, but no tunnel found*/

    public static final int IWLAN_TUNNEL_NOT_FOUND = 0x4006;



    // OEM sepecific error codes. To be used by OEMs when they don't

    // want to reveal error code which would be replaced by ERROR_UNSPECIFIED
@@ -1505,6 +1507,7 @@ public final class DataFailCause { 
        sFailCauseMap.put(IWLAN_IKEV2_CERT_INVALID, "IWLAN_IKEV2_CERT_INVALID");

        sFailCauseMap.put(IWLAN_DNS_RESOLUTION_NAME_FAILURE, "IWLAN_DNS_RESOLUTION_NAME_FAILURE");

        sFailCauseMap.put(IWLAN_DNS_RESOLUTION_TIMEOUT, "IWLAN_DNS_RESOLUTION_TIMEOUT");

        sFailCauseMap.put(IWLAN_TUNNEL_NOT_FOUND, "IWLAN_TUNNEL_NOT_FOUND");

        sFailCauseMap.put(OEM_DCFAILCAUSE_1, "OEM_DCFAILCAUSE_1");

        sFailCauseMap.put(OEM_DCFAILCAUSE_2, "OEM_DCFAILCAUSE_2");

        sFailCauseMap.put(OEM_DCFAILCAUSE_3, "OEM_DCFAILCAUSE_3");