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

Commit 21168348 authored by Tyler Gunn's avatar Tyler Gunn
Browse files

Handle low battery ImsReason and translate to low battery disconnect cause. 

There are two scenarios where we can run into a low battery:
1. onCallTerminated - this would be a mid-call termination.
2. onCallStartFailed - this would be while dialing.

Modified getDisconnectCauseFromReasonInfo to generate the correct
disconnect cause based on whether the call being disconnected is in
progress or dialing.

Test: Manual
Merged-In: If8672f4fb34e63f68868821b1fb203cd2676f78b
Change-Id: If8672f4fb34e63f68868821b1fb203cd2676f78b
Fixes: 63936576
parent 11e98544

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

+40 −5
Original line number Diff line number Diff line
@@ -1758,10 +1758,17 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
        return code;

    }



    private int getDisconnectCauseFromReasonInfo(ImsReasonInfo reasonInfo) {

    /**

     * Maps an {@link ImsReasonInfo} reason code to a {@link DisconnectCause} cause code.

     * The {@link Call.State} provided is the state of the call prior to disconnection.

     * @param reasonInfo the {@link ImsReasonInfo} for the disconnection.

     * @param callState The {@link Call.State} prior to disconnection.

     * @return The {@link DisconnectCause} code.

     */

    @VisibleForTesting

    public int getDisconnectCauseFromReasonInfo(ImsReasonInfo reasonInfo, Call.State callState) {

        int cause = DisconnectCause.ERROR_UNSPECIFIED;



        //int type = reasonInfo.getReasonType();

        int code = maybeRemapReasonCode(reasonInfo);

        switch (code) {

            case ImsReasonInfo.CODE_SIP_BAD_ADDRESS:
@@ -1817,10 +1824,18 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
            case ImsReasonInfo.CODE_TIMEOUT_NO_ANSWER_CALL_UPDATE:

                return DisconnectCause.TIMED_OUT;



            case ImsReasonInfo.CODE_LOCAL_LOW_BATTERY:

            case ImsReasonInfo.CODE_LOCAL_POWER_OFF:

                return DisconnectCause.POWER_OFF;



            case ImsReasonInfo.CODE_LOCAL_LOW_BATTERY:

            case ImsReasonInfo.CODE_LOW_BATTERY: {

                if (callState == Call.State.DIALING) {

                    return DisconnectCause.DIAL_LOW_BATTERY;

                } else {

                    return DisconnectCause.LOW_BATTERY;

                }

            }



            case ImsReasonInfo.CODE_FDN_BLOCKED:

                return DisconnectCause.FDN_BLOCKED;
@@ -1968,8 +1983,18 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
                    return;

                } else {

                    mPendingMO = null;

                    int cause = getDisconnectCauseFromReasonInfo(reasonInfo);

                    ImsPhoneConnection conn = findConnection(imsCall);

                    Call.State callState;

                    if (conn != null) {

                        callState = conn.getState();

                    } else {

                        // Need to fall back in case connection is null; it shouldn't be, but a sane

                        // fallback is to assume we're dialing.  This state is only used to

                        // determine which disconnect string to show in the case of a low battery

                        // disconnect.

                        callState = Call.State.DIALING;

                    }

                    int cause = getDisconnectCauseFromReasonInfo(reasonInfo, callState);



                    if(conn != null) {

                        conn.setPreciseDisconnectCause(
@@ -1987,8 +2012,18 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
        public void onCallTerminated(ImsCall imsCall, ImsReasonInfo reasonInfo) {

            if (DBG) log("onCallTerminated reasonCode=" + reasonInfo.getCode());



            int cause = getDisconnectCauseFromReasonInfo(reasonInfo);

            ImsPhoneConnection conn = findConnection(imsCall);

            Call.State callState;

            if (conn != null) {

                callState = conn.getState();

            } else {

                // Connection shouldn't be null, but if it is, we can assume the call was active.

                // This call state is only used for determining which disconnect message to show in

                // the case of the device's battery being low resulting in a call drop.

                callState = Call.State.ACTIVE;

            }

            int cause = getDisconnectCauseFromReasonInfo(reasonInfo, callState);



            if (DBG) log("cause = " + cause + " conn = " + conn);



            if (conn != null) {

tests/telephonytests/src/com/android/internal/telephony/imsphone/ImsPhoneCallTrackerTest.java

+19 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import android.os.Handler; 
import android.os.HandlerThread;

import android.os.Message;

import android.support.test.filters.FlakyTest;

import android.telephony.DisconnectCause;

import android.telephony.PhoneNumberUtils;

import android.telephony.ims.feature.ImsFeature;

import android.test.suitebuilder.annotation.SmallTest;
@@ -496,4 +497,22 @@ public class ImsPhoneCallTrackerTest extends TelephonyTest { 
        verify(mImsManager, times(2)).open(anyInt(), nullable(PendingIntent.class),

                nullable(ImsConnectionStateListener.class));

    }



    @Test

    @SmallTest

    public void testLowBatteryDisconnectMidCall() {

        assertEquals(DisconnectCause.LOW_BATTERY, mCTUT.getDisconnectCauseFromReasonInfo(

                new ImsReasonInfo(ImsReasonInfo.CODE_LOCAL_LOW_BATTERY, 0), Call.State.ACTIVE));

        assertEquals(DisconnectCause.LOW_BATTERY, mCTUT.getDisconnectCauseFromReasonInfo(

                new ImsReasonInfo(ImsReasonInfo.CODE_LOW_BATTERY, 0), Call.State.ACTIVE));

    }



    @Test

    @SmallTest

    public void testLowBatteryDisconnectDialing() {

        assertEquals(DisconnectCause.DIAL_LOW_BATTERY, mCTUT.getDisconnectCauseFromReasonInfo(

                new ImsReasonInfo(ImsReasonInfo.CODE_LOCAL_LOW_BATTERY, 0), Call.State.DIALING));

        assertEquals(DisconnectCause.DIAL_LOW_BATTERY, mCTUT.getDisconnectCauseFromReasonInfo(

                new ImsReasonInfo(ImsReasonInfo.CODE_LOW_BATTERY, 0), Call.State.DIALING));

    }

}