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

Commit a0dc1bd1 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Distinguish CDMA and IMS ECBM" am: 8459624d

Change-Id: I5b6d3a207fc1132aca045c8d0bc8961863b77eb6
parents 53414ee9 8459624d
Loading
Loading
Loading
Loading
+2 −4
Original line number Diff line number Diff line
@@ -3314,10 +3314,8 @@ public class GsmCdmaPhone extends Phone {
            Rlog.d(LOG_TAG, "exitEmergencyCallbackMode: mImsPhone=" + mImsPhone
                    + " isPhoneTypeGsm=" + isPhoneTypeGsm());
        }
        if (isPhoneTypeGsm()) {
            if (mImsPhone != null) {
        if (mImsPhone != null && mImsPhone.isInImsEcm()) {
            mImsPhone.exitEmergencyCallbackMode();
            }
        } else {
            if (mWakeLock.isHeld()) {
                mWakeLock.release();
+4 −0
Original line number Diff line number Diff line
@@ -2466,6 +2466,10 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
        return mIsPhoneInEcmState;
    }

    public boolean isInImsEcm() {
        return false;
    }

    public void setIsInEcm(boolean isInEcm) {
        if (!getUnitTestMode()) {
            TelephonyProperties.in_ecm_mode(isInEcm);
+8 −0
Original line number Diff line number Diff line
@@ -239,6 +239,8 @@ public class ImsPhone extends ImsPhoneBase {

    private boolean mRoaming = false;

    private boolean mIsInImsEcm = false;

    // List of Registrants to send supplementary service notifications to.
    private RegistrantList mSsnRegistrants = new RegistrantList();

@@ -845,6 +847,11 @@ public class ImsPhone extends ImsPhoneBase {
               ringingCallState.isAlive());
    }

    @Override
    public boolean isInImsEcm() {
        return mIsInImsEcm;
    }

    @Override
    public boolean isInEcm() {
        return mDefaultPhone.isInEcm();
@@ -852,6 +859,7 @@ public class ImsPhone extends ImsPhoneBase {

    @Override
    public void setIsInEcm(boolean isInEcm){
        mIsInImsEcm = isInEcm;
        mDefaultPhone.setIsInEcm(isInEcm);
    }