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

Commit 23817768 authored by Sungjae's avatar Sungjae Committed by Dheeraj Shetty
Browse files

Fix duplicate handling of exit ECBM 



After sending RIL_REQUEST_EXIT_EMERGENCY_CALLBACK_MODE,
Modem will send RIL_UNSOL_EXIT_EMERGENCY_CALLBACK_MODE.
No need to invoke handleExitEmergencyCallbackMode.
handleExitEmergencyCallbackMode will be called by indication.

Bug: 146528627

Change-Id: I7202c8ea4f22f25bdf56a368aef8007d49622dde
Signed-off-by: default avatarSungjae <sung_jae.kim@samsung.com>
parent a8ad3cda

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);

        }

    }