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

Commit 91aa94c1 authored by Brad Ebinger's avatar Brad Ebinger Committed by android-build-merger
Browse files

Merge "Emergency redial implementation" am: 2341ae2e 

am: e5629078

Change-Id: Id1f1124a6d5886aea4e08f3066ea06524e5218dd
parents ec201916 e5629078

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

+4 −0
Original line number Diff line number Diff line
@@ -60,6 +60,10 @@ public interface CallFailCause { 
    int DIAL_MODIFIED_TO_SS   = 245;

    int DIAL_MODIFIED_TO_DIAL = 246;



    //Emergency Redial

    int EMERGENCY_TEMP_FAILURE = 325;

    int EMERGENCY_PERM_FAILURE = 326;



    int CDMA_LOCKED_UNTIL_POWER_CYCLE  = 1000;

    int CDMA_DROP                      = 1001;

    int CDMA_INTERCEPT                 = 1002;

src/java/com/android/internal/telephony/GsmCdmaConnection.java

+5 −0
Original line number Diff line number Diff line
@@ -441,6 +441,11 @@ public class GsmCdmaConnection extends Connection { 
            case CallFailCause.BEARER_NOT_AVAIL:

                return DisconnectCause.CONGESTION;



            case CallFailCause.EMERGENCY_TEMP_FAILURE:

                return DisconnectCause.EMERGENCY_TEMP_FAILURE;

            case CallFailCause.EMERGENCY_PERM_FAILURE:

                return DisconnectCause.EMERGENCY_PERM_FAILURE;



            case CallFailCause.ACM_LIMIT_EXCEEDED:

                return DisconnectCause.LIMIT_EXCEEDED;

src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java

+7 −0
Original line number Diff line number Diff line
@@ -1893,6 +1893,13 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 


            case ImsReasonInfo.CODE_ACCESS_CLASS_BLOCKED:

                return DisconnectCause.IMS_ACCESS_BLOCKED;



            case ImsReasonInfo.CODE_EMERGENCY_TEMP_FAILURE:

                return DisconnectCause.EMERGENCY_TEMP_FAILURE;



            case ImsReasonInfo.CODE_EMERGENCY_PERM_FAILURE:

                return DisconnectCause.EMERGENCY_PERM_FAILURE;



            default:

        }