resolve merge conflicts of 4e1353794 to stage-aosp-master (72b6af0b) · Commits · e / os / android_frameworks_opt_telephony

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

+12 −17

Original line number	Diff line number	Diff line
		@@ -619,20 +619,11 @@ public class GsmCdmaPhone extends Phone {
		}
		}

		@Override
		public boolean isInEcm() {
		if (isPhoneTypeGsm()) {
		return false;
		} else {
		return mIsPhoneInEcmState;
		}
		}

		//CDMA
		private void sendEmergencyCallbackModeChange(){
		//Send an Intent
		Intent intent = new Intent(TelephonyIntents.ACTION_EMERGENCY_CALLBACK_MODE_CHANGED);
		intent.putExtra(PhoneConstants.PHONE_IN_ECM_STATE, mIsPhoneInEcmState);
		intent.putExtra(PhoneConstants.PHONE_IN_ECM_STATE, isInEcm());
		SubscriptionManager.putPhoneIdAndSubIdExtra(intent, getPhoneId());
		ActivityManager.broadcastStickyIntent(intent, UserHandle.USER_ALL);
		if (DBG) logd("sendEmergencyCallbackModeChange");
		@@ -2795,6 +2786,10 @@ public class GsmCdmaPhone extends Phone {

		@Override
		public void exitEmergencyCallbackMode() {
		if (DBG) {
		Rlog.d(LOG_TAG, "exitEmergencyCallbackMode: mImsPhone=" + mImsPhone
		+ " isPhoneTypeGsm=" + isPhoneTypeGsm());
		}
		if (isPhoneTypeGsm()) {
		if (mImsPhone != null) {
		mImsPhone.exitEmergencyCallbackMode();
		@@ -2811,11 +2806,11 @@ public class GsmCdmaPhone extends Phone {
		//CDMA
		private void handleEnterEmergencyCallbackMode(Message msg) {
		if (DBG) {
		Rlog.d(LOG_TAG, "handleEnterEmergencyCallbackMode,mIsPhoneInEcmState= "
		+ mIsPhoneInEcmState);
		Rlog.d(LOG_TAG, "handleEnterEmergencyCallbackMode, isInEcm()="
		+ isInEcm());
		}
		// if phone is not in Ecm mode, and it's changed to Ecm mode
		if (!mIsPhoneInEcmState) {
		if (!isInEcm()) {
		setIsInEcm(true);

		// notify change
		@@ -2835,8 +2830,8 @@ public class GsmCdmaPhone extends Phone {
		private void handleExitEmergencyCallbackMode(Message msg) {
		AsyncResult ar = (AsyncResult)msg.obj;
		if (DBG) {
		Rlog.d(LOG_TAG, "handleExitEmergencyCallbackMode,ar.exception , mIsPhoneInEcmState "
		+ ar.exception + mIsPhoneInEcmState);
		Rlog.d(LOG_TAG, "handleExitEmergencyCallbackMode,ar.exception , isInEcm="
		+ ar.exception + isInEcm());
		}
		// Remove pending exit Ecm runnable, if any
		removeCallbacks(mExitEcmRunnable);
		@@ -2846,7 +2841,7 @@ public class GsmCdmaPhone extends Phone {
		}
		// if exiting ecm success
		if (ar.exception == null) {
		if (mIsPhoneInEcmState) {
		if (isInEcm()) {
		setIsInEcm(false);
		}

		@@ -3281,7 +3276,7 @@ public class GsmCdmaPhone extends Phone {
		pw.println(" mCdmaSubscriptionSource=" + mCdmaSubscriptionSource);
		pw.println(" mEriManager=" + mEriManager);
		pw.println(" mWakeLock=" + mWakeLock);
		pw.println(" mIsPhoneInEcmState=" + mIsPhoneInEcmState);
		pw.println(" isInEcm()=" + isInEcm());
		if (VDBG) pw.println(" mEsn=" + mEsn);
		if (VDBG) pw.println(" mMeid=" + mMeid);
		pw.println(" mCarrierOtaSpNumSchema=" + mCarrierOtaSpNumSchema);

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -2162,8 +2162,6 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		* @return {@code true} if we are in emergency call back mode. This is a period where the phone
		* should be using as little power as possible and be ready to receive an incoming call from the
		* emergency operator.
		*
		* This method is overridden for GSM phones to return false always
		*/
		public boolean isInEcm() {
		return mIsPhoneInEcmState;

src/java/com/android/internal/telephony/imsphone/ImsPhone.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1378,7 +1378,7 @@ public class ImsPhone extends ImsPhoneBase {
		intent.putExtra(PhoneConstants.PHONE_IN_ECM_STATE, isInEcm());
		SubscriptionManager.putPhoneIdAndSubIdExtra(intent, getPhoneId());
		ActivityManager.broadcastStickyIntent(intent, UserHandle.USER_ALL);
		if (DBG) Rlog.d(LOG_TAG, "sendEmergencyCallbackModeChange");
		if (DBG) Rlog.d(LOG_TAG, "sendEmergencyCallbackModeChange: isInEcm=" + isInEcm());
		}

		@Override