Snap for 9410359 from e228b831129642863b33e067cece58cb7db4a023 to tm-qpr2-release (b1b8f18e) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/metrics/VoiceCallSessionStats.java

+24 −1

Original line number	Diff line number	Diff line
		@@ -465,8 +465,14 @@ public class VoiceCallSessionStats {
		proto.isRoaming = serviceState != null ? serviceState.getVoiceRoaming() : false;
		proto.isMultiparty = conn.isMultiparty();
		proto.lastKnownRat = rat;

		// internal fields for tracking
		if (getDirection(conn) == VOICE_CALL_SESSION__DIRECTION__CALL_DIRECTION_MT) {
		// MT call setup hasn't begun hence set to 0
		proto.setupBeginMillis = 0L;
		} else {
		proto.setupBeginMillis = getTimeMillis();
		}

		// audio codec might have already been set
		int codec = audioQualityToCodec(bearer, conn.getAudioCodec());
		@@ -492,6 +498,12 @@ public class VoiceCallSessionStats {
		loge("finishCall: could not find call to be removed, connectionId=%d", connectionId);
		return;
		}

		// Compute time it took to fail setup (except for MT calls that have never been picked up)
		if (proto.setupFailed && proto.setupBeginMillis != 0L && proto.setupDurationMillis == 0) {
		proto.setupDurationMillis = (int) (getTimeMillis() - proto.setupBeginMillis);
		}

		mCallProtos.delete(connectionId);
		proto.concurrentCallCountAtEnd = mCallProtos.size();

		@@ -514,6 +526,17 @@ public class VoiceCallSessionStats {
		proto.carrierId = mPhone.getCarrierId();
		}

		// Update end RAT
		@NetworkType
		int rat = ServiceStateStats.getVoiceRat(mPhone, getServiceState(), proto.bearerAtEnd);
		if (proto.ratAtEnd != rat) {
		proto.ratSwitchCount++;
		proto.ratAtEnd = rat;
		if (rat != TelephonyManager.NETWORK_TYPE_UNKNOWN) {
		proto.lastKnownRat = rat;
		}
		}

		mAtomsStorage.addVoiceCallSession(proto);

		// merge RAT usages to PersistPullers when the call session ends (i.e. no more active calls)

tests/telephonytests/src/com/android/internal/telephony/metrics/VoiceCallSessionStatsTest.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -288,6 +288,7 @@ public class VoiceCallSessionStatsTest extends TelephonyTest {
		TelephonyManager.NETWORK_TYPE_LTE,
		ImsReasonInfo.CODE_SIP_FORBIDDEN);
		expectedCall.setupFailed = true;
		expectedCall.setupDurationMillis = 200;
		expectedCall.ratAtConnected = TelephonyManager.NETWORK_TYPE_UNKNOWN;
		expectedCall.callDuration = VOICE_CALL_SESSION__CALL_DURATION__CALL_DURATION_UNKNOWN;
		VoiceCallRatUsage expectedRatUsage =
		@@ -331,6 +332,7 @@ public class VoiceCallSessionStatsTest extends TelephonyTest {
		TelephonyManager.NETWORK_TYPE_LTE,
		ImsReasonInfo.CODE_SIP_REQUEST_CANCELLED);
		expectedCall.setupFailed = true;
		expectedCall.setupDurationMillis = 200;
		expectedCall.ratAtConnected = TelephonyManager.NETWORK_TYPE_UNKNOWN;
		expectedCall.callDuration = VOICE_CALL_SESSION__CALL_DURATION__CALL_DURATION_UNKNOWN;
		VoiceCallRatUsage expectedRatUsage =
		@@ -1597,6 +1599,7 @@ public class VoiceCallSessionStatsTest extends TelephonyTest {
		expectedCall.bandAtEnd = 0;
		expectedCall.ratSwitchCount = 1L;
		expectedCall.setupFailed = true;
		expectedCall.setupDurationMillis = 13000;
		expectedCall.ratAtConnected = TelephonyManager.NETWORK_TYPE_UNKNOWN;
		expectedCall.codecBitmask = 0L;
		expectedCall.mainCodecQuality =