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

Commit 478253ab authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Fix duplicate handling of exit ECBM" am: 626fa00c am: 3179939a am: ea36c9cd 

Change-Id: I7d2466fdc433ad6f45960e7802b95138c74a522b
parents ede817b3 ea36c9cd

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

+2 −4
Original line number Diff line number Diff line
@@ -387,8 +387,7 @@ public class GsmCdmaPhone extends Phone { 
            mIsPhoneInEcmState = getInEcmMode();

            if (mIsPhoneInEcmState) {

                // Send a message which will invoke handleExitEmergencyCallbackMode

                mCi.exitEmergencyCallbackMode(

                        obtainMessage(EVENT_EXIT_EMERGENCY_CALLBACK_RESPONSE));

                mCi.exitEmergencyCallbackMode(null);

            }



            mCi.setPhoneType(PhoneConstants.PHONE_TYPE_CDMA);
@@ -3293,8 +3292,7 @@ public class GsmCdmaPhone extends Phone { 
            if (mWakeLock.isHeld()) {

                mWakeLock.release();

            }

            // Send a message which will invoke handleExitEmergencyCallbackMode

            mCi.exitEmergencyCallbackMode(obtainMessage(EVENT_EXIT_EMERGENCY_CALLBACK_RESPONSE));

            mCi.exitEmergencyCallbackMode(null);

        }

    }