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

Commit 626fa00c authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix duplicate handling of exit ECBM"

parents a8ad3cda 23817768

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

+2 −4
Original line number Diff line number Diff line
@@ -388,8 +388,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);

        }

    }