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

Commit e07787e2 authored by Tyler Gunn's avatar Tyler Gunn Committed by android-build-merger
Browse files

Merge "When IMS connections are merged, track connect time elapsed." am: 040230d7 

am: 114a16a2

Change-Id: Ie20d4b20ae5faa7d5b76298be979590fe9fd24e3
parents 67df4b7d 114a16a2

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

+9 −0
Original line number Diff line number Diff line
@@ -310,6 +310,15 @@ public abstract class Connection { 
        mConnectTime = connectTime;

    }



    /**

     * Sets the Connection connect time in {@link SystemClock#elapsedRealtime()} format.

     *

     * @param connectTimeReal the new connect time.

     */

    public void setConnectTimeReal(long connectTimeReal) {

        mConnectTimeReal = connectTimeReal;

    }



    /**

     * Connection connect time in elapsedRealtime() format.

     * For outgoing calls: Begins at (DIALING|ALERTING) -> ACTIVE transition.

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

+1 −0
Original line number Diff line number Diff line
@@ -267,6 +267,7 @@ public class ImsPhoneCall extends Call { 
            long conferenceConnectTime = imsPhoneConnection.getConferenceConnectTime();

            if (conferenceConnectTime > 0) {

                imsPhoneConnection.setConnectTime(conferenceConnectTime);

                imsPhoneConnection.setConnectTimeReal(imsPhoneConnection.getConnectTimeReal());

            } else {

                if (DBG) {

                    Rlog.d(LOG_TAG, "merge: conference connect time is 0");