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

Commit a35827a8 authored by John Huang's avatar John Huang Committed by Android Git Automerger
Browse files

am 33051ad1: am 7dc08fb0: Merge "Fix connect duration for un-established SIP... 

am 33051ad1: am 7dc08fb0: Merge "Fix connect duration for un-established SIP calls." into gingerbread

Merge commit '33051ad1'

* commit '33051ad1':
  Fix connect duration for un-established SIP calls.
parents 5c167f91 33051ad1

telephony/java/com/android/internal/telephony/sip/SipConnectionBase.java

+3 −3
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ abstract class SipConnectionBase extends Connection { 
     * calculating deltas.

     */

    private long connectTimeReal;

    private long duration;

    private long duration = -1L;

    private long holdingStartTime;  // The time when the Connection last transitioned

                            // into HOLDING
@@ -75,7 +75,7 @@ abstract class SipConnectionBase extends Connection { 
                }

                break;

            case DISCONNECTED:

                duration = SystemClock.elapsedRealtime() - connectTimeReal;

                duration = getDurationMillis();

                disconnectTime = System.currentTimeMillis();

                break;

            case HOLDING:
@@ -103,7 +103,7 @@ abstract class SipConnectionBase extends Connection { 
    public long getDurationMillis() {

        if (connectTimeReal == 0) {

            return 0;

        } else if (duration == 0) {

        } else if (duration < 0) {

            return SystemClock.elapsedRealtime() - connectTimeReal;

        } else {

            return duration;