Merge "Fix connect duration for un-established SIP calls." into gingerbread (7dc08fb0) · Commits · e / os / android_frameworks_base

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -49,7 +49,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

		@@ -74,7 +74,7 @@ abstract class SipConnectionBase extends Connection {
		}
		break;
		case DISCONNECTED:
		duration = SystemClock.elapsedRealtime() - connectTimeReal;
		duration = getDurationMillis();
		disconnectTime = System.currentTimeMillis();
		break;
		case HOLDING:
		@@ -102,7 +102,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;