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

Commit 525b2495 authored by lei.huang's avatar lei.huang
Browse files

Issue 128385394: UE fails to disconnect Call from User Interface. 

[root cause  ]phone.getRingingCall() didn't get the handover ringing call
[changes     ]phone.getRingingCall() should get the handover ringing call
[issue address]https://partnerissuetracker.corp.google.com/u/0/issues/128385394

Change-Id: Ib039423228f426a54845c06725962ba7e11cde28
parent 5007054a

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

+12 −0
Original line number Diff line number Diff line
@@ -286,6 +286,18 @@ public abstract class CallTracker extends Handler { 
        return ret;

    }



    /**

     * Get the ringing connections which during SRVCC handover.

     */

    public Connection getRingingHandoverConnection() {

        for (Connection hoConn : mHandoverConnections) {

            if (hoConn.getCall().isRinging()) {

                return hoConn;

            }

        }

        return null;

    }



    //***** Overridden from Handler

    @Override

    public abstract void handleMessage (Message msg);

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

+7 −0
Original line number Diff line number Diff line
@@ -898,6 +898,13 @@ public class GsmCdmaPhone extends Phone { 
        if ( imsPhone != null && imsPhone.getRingingCall().isRinging()) {

            return imsPhone.getRingingCall();

        }

        //It returns the ringing connections which during SRVCC handover

        if (!mCT.mRingingCall.isRinging()

                && mCT.getRingingHandoverConnection() != null

                && mCT.getRingingHandoverConnection().getCall() != null

                && mCT.getRingingHandoverConnection().getCall().isRinging()) {

            return mCT.getRingingHandoverConnection().getCall();

        }

        return mCT.mRingingCall;

    }