Merge "Distinguish CDMA and IMS ECBM" am: 8459624d2c am: a0dc1bd131 am: c6602e2a46 (5197656c) · Commits · e / os / android_frameworks_opt_telephony

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

+2 −4

Original line number	Diff line number	Diff line
		@@ -3351,10 +3351,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
		@@ -2486,6 +2486,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();

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

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

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

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