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

Commit df6ea603 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Support for emergency redial in multisim"

parents 2d40c2b0 c0116d33

src/java/com/android/internal/telephony/cdma/CallFailCause.java

+4 −0
Original line number Diff line number Diff line
@@ -60,5 +60,9 @@ public interface CallFailCause { 
    // Access Blocked by CDMA Network.

    static final int CDMA_ACCESS_BLOCKED            = 1009;



    //Emergency Redial

    static final int EMERGENCY_TEMP_FAILURE = 325;

    static final int EMERGENCY_PERM_FAILURE = 326;



    static final int ERROR_UNSPECIFIED = 0xffff;

}

src/java/com/android/internal/telephony/cdma/CdmaConnection.java

100755 → 100644
+4 −0
Original line number Diff line number Diff line
@@ -372,6 +372,10 @@ public class CdmaConnection extends Connection { 
                return DisconnectCause.CDMA_NOT_EMERGENCY;

            case CallFailCause.CDMA_ACCESS_BLOCKED:

                return DisconnectCause.CDMA_ACCESS_BLOCKED;

            case CallFailCause.EMERGENCY_TEMP_FAILURE:

                return DisconnectCause.EMERGENCY_TEMP_FAILURE;

            case CallFailCause.EMERGENCY_PERM_FAILURE:

                return DisconnectCause.EMERGENCY_PERM_FAILURE;

            case CallFailCause.ERROR_UNSPECIFIED:

            case CallFailCause.NORMAL_CLEARING:

            default:

src/java/com/android/internal/telephony/gsm/CallFailCause.java

+4 −0
Original line number Diff line number Diff line
@@ -55,5 +55,9 @@ public interface CallFailCause { 
    static final int DIAL_MODIFIED_TO_SS = 245;

    static final int DIAL_MODIFIED_TO_DIAL = 246;



    //Emergency Redial

    static final int EMERGENCY_TEMP_FAILURE = 325;

    static final int EMERGENCY_PERM_FAILURE = 326;



    static final int ERROR_UNSPECIFIED = 0xffff;

}

src/java/com/android/internal/telephony/gsm/GsmConnection.java

+6 −0
Original line number Diff line number Diff line
@@ -339,6 +339,12 @@ public class GsmConnection extends Connection { 
            case CallFailCause.DIAL_MODIFIED_TO_DIAL:

                return DisconnectCause.DIAL_MODIFIED_TO_DIAL;



            case CallFailCause.EMERGENCY_TEMP_FAILURE:

                return DisconnectCause.EMERGENCY_TEMP_FAILURE;



            case CallFailCause.EMERGENCY_PERM_FAILURE:

                return DisconnectCause.EMERGENCY_PERM_FAILURE;



            case CallFailCause.ERROR_UNSPECIFIED:

            case CallFailCause.NORMAL_CLEARING:

            default: