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

Commit 608e80d2 authored by Youming Ye's avatar Youming Ye Committed by android-build-merger
Browse files

Merge "Handle CallFailCause ACCESS_CLASS_BLOCKED" am: 25cf06f9 

am: a02b829e

Change-Id: Ibb67dc4af8852053d261723a059ad8faba9b8a51
parents ddbbb66a a02b829e

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

+3 −0
Original line number Diff line number Diff line
@@ -149,6 +149,9 @@ public interface CallFailCause { 
    int DIAL_MODIFIED_TO_SS   = 245;

    int DIAL_MODIFIED_TO_DIAL = 246;



    //Access class blocked - TS 31.121 5.2.1

    int ACCESS_CLASS_BLOCKED = 260;



    //Emergency Redial

    int EMERGENCY_TEMP_FAILURE = 325;

    int EMERGENCY_PERM_FAILURE = 326;

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

+3 −1
Original line number Diff line number Diff line
@@ -528,6 +528,7 @@ public class GsmCdmaConnection extends Connection { 
            case CallFailCause.USER_ALERTING_NO_ANSWER:

                return DisconnectCause.TIMED_OUT;



            case CallFailCause.ACCESS_CLASS_BLOCKED:

            case CallFailCause.ERROR_UNSPECIFIED:

            case CallFailCause.NORMAL_CLEARING:

            default:
@@ -562,7 +563,8 @@ public class GsmCdmaConnection extends Connection { 
                    }

                }

                if (isPhoneTypeGsm()) {

                    if (causeCode == CallFailCause.ERROR_UNSPECIFIED) {

                    if (causeCode == CallFailCause.ERROR_UNSPECIFIED ||

                                   causeCode == CallFailCause.ACCESS_CLASS_BLOCKED ) {

                        if (phone.mSST.mRestrictedState.isCsRestricted()) {

                            return DisconnectCause.CS_RESTRICTED;

                        } else if (phone.mSST.mRestrictedState.isCsEmergencyRestricted()) {