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

Commit 5e234c67 authored by Brad Ebinger's avatar Brad Ebinger
Browse files

Do not set the state to POWER_OFF when in APM for ImsPhone 

There is no need to set the ImsPhone to the state POWER_OFF
when we move into APM, since there is no difference between that
and the OUT_OF_SERVICE state.

Also, removes the POWER_OFF check from the ImsPhoneCallTracker,
as it should only determine whether or not it can dial a call
from the ImsService capabilities at the time of the call.

Bug:62816248
Test: Manual, Test E911 call
Merged-In: Ia4cb40e9d8ddfb9099eae3fbe51a6ad19b521435
Change-Id: I904be6a8e79d40ebf8f8dae81277169ad7dabfcc
parent 0624b77b

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

+0 −4
Original line number Diff line number Diff line
@@ -2068,10 +2068,6 @@ public class GsmCdmaPhone extends Phone { 
                }

            }

        }

        Phone imsPhone = mImsPhone;

        if (imsPhone != null) {

            imsPhone.getServiceState().setStateOff();

        }

        mRadioOffOrNotAvailableRegistrants.notifyRegistrants();

    }

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

+6 −9
Original line number Diff line number Diff line
@@ -1256,15 +1256,12 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
            && !mForegroundCall.isFull();

    }



    public boolean

    canDial() {

    public boolean canDial() {

        boolean ret;

        int serviceState = mPhone.getServiceState().getState();

        String disableCall = SystemProperties.get(

                TelephonyProperties.PROPERTY_DISABLE_CALL, "false");



        ret = (serviceState != ServiceState.STATE_POWER_OFF)

            && mPendingMO == null

        ret = mPendingMO == null

                && !mRingingCall.isRinging()

                && !disableCall.equals("true")

                && (!mForegroundCall.getState().isAlive()