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

Commit 7eac5cfb authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Dial emergency call just after APM OFF" am: eb70b41a am: 90fba077 am: 08d61280 

Change-Id: Ie09b85fdff8718502810f1c9374a421816bdf2f0
parents 8e78c8b6 08d61280

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

+4 −6
Original line number Original line Diff line number Diff line
@@ -2490,8 +2490,8 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
            if (reasonInfo.getCode() == ImsReasonInfo.CODE_SIP_ALTERNATE_EMERGENCY_CALL

            if (reasonInfo.getCode() == ImsReasonInfo.CODE_SIP_ALTERNATE_EMERGENCY_CALL

                    && mAutoRetryFailedWifiEmergencyCall) {

                    && mAutoRetryFailedWifiEmergencyCall) {

                Pair<ImsCall, ImsReasonInfo> callInfo = new Pair<>(imsCall, reasonInfo);

                Pair<ImsCall, ImsReasonInfo> callInfo = new Pair<>(imsCall, reasonInfo);

                mPhone.getDefaultPhone().getServiceStateTracker().registerForNetworkAttached(

                mPhone.getDefaultPhone().mCi.registerForOn(ImsPhoneCallTracker.this,

                        ImsPhoneCallTracker.this, EVENT_REDIAL_WIFI_E911_CALL, callInfo);

                        EVENT_REDIAL_WIFI_E911_CALL, callInfo);

                sendMessageDelayed(obtainMessage(EVENT_REDIAL_WIFI_E911_TIMEOUT, callInfo),

                sendMessageDelayed(obtainMessage(EVENT_REDIAL_WIFI_E911_TIMEOUT, callInfo),

                        TIMEOUT_REDIAL_WIFI_E911_MS);

                        TIMEOUT_REDIAL_WIFI_E911_MS);

                final ConnectivityManager mgr = (ConnectivityManager) mPhone.getContext()

                final ConnectivityManager mgr = (ConnectivityManager) mPhone.getContext()
@@ -3544,8 +3544,7 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
                Pair<ImsCall, ImsReasonInfo> callInfo =

                Pair<ImsCall, ImsReasonInfo> callInfo =

                        (Pair<ImsCall, ImsReasonInfo>) ((AsyncResult) msg.obj).userObj;

                        (Pair<ImsCall, ImsReasonInfo>) ((AsyncResult) msg.obj).userObj;

                removeMessages(EVENT_REDIAL_WIFI_E911_TIMEOUT);

                removeMessages(EVENT_REDIAL_WIFI_E911_TIMEOUT);

                mPhone.getDefaultPhone().getServiceStateTracker()

                mPhone.getDefaultPhone().mCi.unregisterForOn(this);

                        .unregisterForNetworkAttached(this);

                ImsPhoneConnection oldConnection = findConnection(callInfo.first);

                ImsPhoneConnection oldConnection = findConnection(callInfo.first);

                if (oldConnection == null) {

                if (oldConnection == null) {

                    sendCallStartFailedDisconnect(callInfo.first, callInfo.second);

                    sendCallStartFailedDisconnect(callInfo.first, callInfo.second);
@@ -3573,8 +3572,7 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
            }

            }

            case EVENT_REDIAL_WIFI_E911_TIMEOUT: {

            case EVENT_REDIAL_WIFI_E911_TIMEOUT: {

                Pair<ImsCall, ImsReasonInfo> callInfo = (Pair<ImsCall, ImsReasonInfo>) msg.obj;

                Pair<ImsCall, ImsReasonInfo> callInfo = (Pair<ImsCall, ImsReasonInfo>) msg.obj;

                mPhone.getDefaultPhone().getServiceStateTracker()

                mPhone.getDefaultPhone().mCi.unregisterForOn(this);

                        .unregisterForNetworkAttached(this);

                removeMessages(EVENT_REDIAL_WIFI_E911_CALL);

                removeMessages(EVENT_REDIAL_WIFI_E911_CALL);

                sendCallStartFailedDisconnect(callInfo.first, callInfo.second);

                sendCallStartFailedDisconnect(callInfo.first, callInfo.second);

                break;

                break;