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

Commit 2e4aad90 authored by Brad Ebinger's avatar Brad Ebinger Committed by android-build-merger
Browse files

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

am: 63a4e77c

Change-Id: I969741e133d3c45fecf9bc716482c9722b7c2142
parents 75417bac 63a4e77c

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

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