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

Commit bcfb3339 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by android-build-merger
Browse files

Merge "Map IMEI_NOT_ACCEPTED fail cause" am: 06d6647b am: 31b1bb78 

am: b1e4633f

Change-Id: I958dad8b2ecabf5752fd80a8ce70a00f7c7ef448
parents b6544a93 b1e4633f

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

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ public interface CallFailCause { 
    int ACM_LIMIT_EXCEEDED = 68;

    int CALL_BARRED        = 240;

    int FDN_BLOCKED        = 241;

    int IMEI_NOT_ACCEPTED  = 243;



    // Stk Call Control

    int DIAL_MODIFIED_TO_USSD = 244;

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

+5 −3
Original line number Diff line number Diff line
@@ -26,16 +26,15 @@ import android.os.Registrant; 
import android.os.SystemClock;

import android.telephony.CarrierConfigManager;

import android.telephony.DisconnectCause;

import android.telephony.Rlog;

import android.telephony.PhoneNumberUtils;

import android.telephony.Rlog;

import android.telephony.ServiceState;

import android.text.TextUtils;



import com.android.internal.telephony.cdma.CdmaCallWaitingNotification;

import com.android.internal.telephony.cdma.CdmaSubscriptionSourceManager;

import com.android.internal.telephony.uicc.UiccCardApplication;

import com.android.internal.telephony.uicc.UiccController;

import com.android.internal.telephony.uicc.IccCardApplicationStatus.AppState;

import com.android.internal.telephony.uicc.UiccCardApplication;



/**

 * {@hide}
@@ -447,6 +446,9 @@ public class GsmCdmaConnection extends Connection { 
            case CallFailCause.FDN_BLOCKED:

                return DisconnectCause.FDN_BLOCKED;



            case CallFailCause.IMEI_NOT_ACCEPTED:

                return DisconnectCause.IMEI_NOT_ACCEPTED;



            case CallFailCause.UNOBTAINABLE_NUMBER:

                return DisconnectCause.UNOBTAINABLE_NUMBER;