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

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

Merge "Merge "Merge "Telephony: report emergency call fail cause properly."""

parents 3cc532a7 aa8c9947

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

+4 −0
Original line number Diff line number Diff line
@@ -2200,4 +2200,8 @@ public class CallManager { 
        return false;

    }



    public boolean canConference(Call heldCall, int subscription) {

        Rlog.e(LOG_TAG, " canConference for subscription not supported");

        return false;

    }

}

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

+2 −0
Original line number Diff line number Diff line
@@ -76,6 +76,8 @@ public abstract class Connection { 
        CDMA_PREEMPTED,

        CDMA_NOT_EMERGENCY,              /* not an emergency call */

        CDMA_ACCESS_BLOCKED,            /* Access Blocked by CDMA network */

        EMERGENCY_TEMP_FAILURE,         /* EMERGENCY call failed with temporary fail cause */

        EMERGENCY_PERM_FAILURE,         /* EMERGENCY call failed with permanent fail cause */

        ERROR_UNSPECIFIED,

        /* Ims Disconnect cause grouped from here */

        CALL_FAIL_MISC

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

+4 −0
Original line number Diff line number Diff line
@@ -45,6 +45,10 @@ 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 CDMA_LOCKED_UNTIL_POWER_CYCLE  = 1000;

    static final int CDMA_DROP                      = 1001;

    static final int CDMA_INTERCEPT                 = 1002;

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

+11 −2
Original line number Diff line number Diff line
@@ -412,6 +412,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:
@@ -422,8 +426,13 @@ public class CdmaConnection extends Connection { 
                if (serviceState == ServiceState.STATE_POWER_OFF) {

                    return DisconnectCause.POWER_OFF;

                } else if (serviceState == ServiceState.STATE_OUT_OF_SERVICE

                        || serviceState == ServiceState.STATE_EMERGENCY_ONLY) {

                        || phone.getServiceState().isEmergencyOnly()) {

                    if (phone.getServiceState().isEmergencyOnly() &&

                            causeCode == CallFailCause.NORMAL_CLEARING) {

                        return DisconnectCause.NORMAL;

                    } else {

                        return DisconnectCause.OUT_OF_SERVICE;

                    }

                } else if (phone.mCdmaSubscriptionSource ==

                        CdmaSubscriptionSourceManager.SUBSCRIPTION_FROM_RUIM

                        && uiccAppState != AppState.APPSTATE_READY) {

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;

}