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

Commit bcd74840 authored by Brad Ebinger's avatar Brad Ebinger Committed by Android (Google) Code Review
Browse files

Merge "Do not set the state to POWER_OFF when in APM for ImsPhone" into oc-dr1-dev

parents dbc97213 d913f668

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

+0 −4
Original line number Diff line number Diff line
@@ -2095,10 +2095,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
@@ -1287,15 +1287,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()