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

Commit d25e857d authored by Kiwon Park's avatar Kiwon Park
Browse files

Deprecate setupDuration in VoiceCallSession and remove corresponding 

code.

Test: statsd_testdrive
Bug: 232835784
Change-Id: If2b03265927d57bd42213feee1c56c8c13581a40
parent c5770ff7

proto/src/persist_atoms.proto

+1 −1
Original line number Diff line number Diff line
@@ -181,10 +181,10 @@ message PersistAtoms { 
// NOTE: StatsLog functions use int in place of enum



message VoiceCallSession {

    reserved 4;

    optional int32 bearer_at_start = 1;

    optional int32 bearer_at_end = 2;

    optional int32 direction = 3;

    optional int32 setup_duration = 4;

    optional bool setup_failed = 5;

    optional int32 disconnect_reason_code = 6;

    optional int32 disconnect_extra_code = 7;

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

+3 −1
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ import static com.android.internal.telephony.TelephonyStatsLog.TELEPHONY_NETWORK 
import static com.android.internal.telephony.TelephonyStatsLog.UCE_EVENT_STATS;

import static com.android.internal.telephony.TelephonyStatsLog.VOICE_CALL_RAT_USAGE;

import static com.android.internal.telephony.TelephonyStatsLog.VOICE_CALL_SESSION;

import static com.android.internal.telephony.TelephonyStatsLog.VOICE_CALL_SESSION__CALL_DURATION__CALL_DURATION_UNKNOWN;



import android.annotation.Nullable;

import android.app.StatsManager;
@@ -719,7 +720,8 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback { 
                session.bearerAtStart,

                session.bearerAtEnd,

                session.direction,

                session.setupDuration,

                // deprecated and replaced by setupDurationMillis

                VOICE_CALL_SESSION__CALL_DURATION__CALL_DURATION_UNKNOWN,

                session.setupFailed,

                session.disconnectReasonCode,

                session.disconnectExtraCode,

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

+0 −61
Original line number Diff line number Diff line
@@ -33,16 +33,6 @@ import static com.android.internal.telephony.TelephonyStatsLog.VOICE_CALL_SESSIO 
import static com.android.internal.telephony.TelephonyStatsLog.VOICE_CALL_SESSION__MAIN_CODEC_QUALITY__CODEC_QUALITY_SUPER_WIDEBAND;

import static com.android.internal.telephony.TelephonyStatsLog.VOICE_CALL_SESSION__MAIN_CODEC_QUALITY__CODEC_QUALITY_UNKNOWN;

import static com.android.internal.telephony.TelephonyStatsLog.VOICE_CALL_SESSION__MAIN_CODEC_QUALITY__CODEC_QUALITY_WIDEBAND;

import static com.android.internal.telephony.TelephonyStatsLog.VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_EXTREMELY_FAST;

import static com.android.internal.telephony.TelephonyStatsLog.VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_EXTREMELY_SLOW;

import static com.android.internal.telephony.TelephonyStatsLog.VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_FAST;

import static com.android.internal.telephony.TelephonyStatsLog.VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_NORMAL;

import static com.android.internal.telephony.TelephonyStatsLog.VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_SLOW;

import static com.android.internal.telephony.TelephonyStatsLog.VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_ULTRA_FAST;

import static com.android.internal.telephony.TelephonyStatsLog.VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_ULTRA_SLOW;

import static com.android.internal.telephony.TelephonyStatsLog.VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_UNKNOWN;

import static com.android.internal.telephony.TelephonyStatsLog.VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_VERY_FAST;

import static com.android.internal.telephony.TelephonyStatsLog.VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_VERY_SLOW;

import static com.android.internal.telephony.TelephonyStatsLog.VOICE_CALL_SESSION__SIGNAL_STRENGTH_AT_END__SIGNAL_STRENGTH_GREAT;

import static com.android.internal.telephony.TelephonyStatsLog.VOICE_CALL_SESSION__SIGNAL_STRENGTH_AT_END__SIGNAL_STRENGTH_NONE_OR_UNKNOWN;
@@ -125,9 +115,6 @@ public class VoiceCallSessionStats { 
    /** Holds the audio codec value for IMS calls. */

    private static final SparseIntArray IMS_CODEC_MAP = buildImsCodecMap();



    /** Holds setup duration buckets with values as their upper bounds in milliseconds. */

    private static final SparseIntArray CALL_SETUP_DURATION_MAP = buildCallSetupDurationMap();



    /** Holds call duration buckets with values as their upper bounds in milliseconds. */

    private static final SparseIntArray CALL_DURATION_MAP = buildCallDurationMap();
@@ -395,7 +382,6 @@ public class VoiceCallSessionStats { 
            logd("acceptCall: resetting setup info, connectionId=%d", id);

            VoiceCallSession proto = mCallProtos.get(id);

            proto.setupBeginMillis = getTimeMillis();

            proto.setupDuration = VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_UNKNOWN;

        } else {

            loge("acceptCall: untracked connection, connectionId=%d", id);

        }
@@ -424,7 +410,6 @@ public class VoiceCallSessionStats { 
        proto.bearerAtStart = bearer;

        proto.bearerAtEnd = bearer;

        proto.direction = getDirection(conn);

        proto.setupDuration = VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_UNKNOWN;

        proto.setupFailed = true;

        proto.disconnectReasonCode = conn.getDisconnectCause();

        proto.disconnectExtraCode = conn.getPreciseDisconnectCause();
@@ -542,7 +527,6 @@ public class VoiceCallSessionStats { 
    private void checkCallSetup(Connection conn, VoiceCallSession proto) {

        if (proto.setupBeginMillis != 0L && isSetupFinished(conn.getCall())) {

            proto.setupDurationMillis = (int) (getTimeMillis() - proto.setupBeginMillis);

            proto.setupDuration = classifySetupDuration(proto.setupDurationMillis);

            proto.setupBeginMillis = 0L;

        }

        // Clear setupFailed if call now active, but otherwise leave it unchanged
@@ -746,16 +730,6 @@ public class VoiceCallSessionStats { 
        }

    }



    private static int classifySetupDuration(int durationMillis) {

        // keys in CALL_SETUP_DURATION_MAP are upper bounds in ascending order

        for (int i = 0; i < CALL_SETUP_DURATION_MAP.size(); i++) {

            if (durationMillis < CALL_SETUP_DURATION_MAP.keyAt(i)) {

                return CALL_SETUP_DURATION_MAP.valueAt(i);

            }

        }

        return VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_EXTREMELY_SLOW;

    }



    private static int classifyCallDuration(long durationMillis) {

        if (durationMillis == 0L) {

            return VOICE_CALL_SESSION__CALL_DURATION__CALL_DURATION_UNKNOWN;
@@ -834,41 +808,6 @@ public class VoiceCallSessionStats { 
        return map;

    }



    private static SparseIntArray buildCallSetupDurationMap() {

        SparseIntArray map = new SparseIntArray();



        map.put(

                CALL_SETUP_DURATION_UNKNOWN,

                VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_UNKNOWN);

        map.put(

                CALL_SETUP_DURATION_EXTREMELY_FAST,

                VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_EXTREMELY_FAST);

        map.put(

                CALL_SETUP_DURATION_ULTRA_FAST,

                VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_ULTRA_FAST);

        map.put(

                CALL_SETUP_DURATION_VERY_FAST,

                VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_VERY_FAST);

        map.put(

                CALL_SETUP_DURATION_FAST,

                VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_FAST);

        map.put(

                CALL_SETUP_DURATION_NORMAL,

                VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_NORMAL);

        map.put(

                CALL_SETUP_DURATION_SLOW,

                VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_SLOW);

        map.put(

                CALL_SETUP_DURATION_VERY_SLOW,

                VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_VERY_SLOW);

        map.put(

                CALL_SETUP_DURATION_ULTRA_SLOW,

                VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_ULTRA_SLOW);

        // anything above would be CALL_SETUP_DURATION_EXTREMELY_SLOW



        return map;

    }



    private static SparseIntArray buildCallDurationMap() {

        SparseIntArray map = new SparseIntArray();

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

+0 −11
Original line number Diff line number Diff line
@@ -26,9 +26,6 @@ import static com.android.internal.telephony.TelephonyStatsLog.VOICE_CALL_SESSIO 
import static com.android.internal.telephony.TelephonyStatsLog.VOICE_CALL_SESSION__BEARER_AT_END__CALL_BEARER_IMS;

import static com.android.internal.telephony.TelephonyStatsLog.VOICE_CALL_SESSION__DIRECTION__CALL_DIRECTION_MO;

import static com.android.internal.telephony.TelephonyStatsLog.VOICE_CALL_SESSION__DIRECTION__CALL_DIRECTION_MT;

import static com.android.internal.telephony.TelephonyStatsLog.VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_EXTREMELY_FAST;

import static com.android.internal.telephony.TelephonyStatsLog.VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_VERY_FAST;

import static com.android.internal.telephony.TelephonyStatsLog.VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_VERY_SLOW;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertNotNull;
@@ -226,8 +223,6 @@ public class PersistAtomsStorageTest extends TelephonyTest { 
        mCall1Proto.bearerAtStart = VOICE_CALL_SESSION__BEARER_AT_END__CALL_BEARER_IMS;

        mCall1Proto.bearerAtEnd = VOICE_CALL_SESSION__BEARER_AT_END__CALL_BEARER_CS;

        mCall1Proto.direction = VOICE_CALL_SESSION__DIRECTION__CALL_DIRECTION_MO;

        mCall1Proto.setupDuration =

                VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_VERY_FAST;

        mCall1Proto.setupFailed = false;

        mCall1Proto.disconnectReasonCode = DisconnectCause.LOCAL;

        mCall1Proto.disconnectExtraCode = 0;
@@ -256,8 +251,6 @@ public class PersistAtomsStorageTest extends TelephonyTest { 
        mCall2Proto.bearerAtStart = VOICE_CALL_SESSION__BEARER_AT_END__CALL_BEARER_IMS;

        mCall2Proto.bearerAtEnd = VOICE_CALL_SESSION__BEARER_AT_END__CALL_BEARER_IMS;

        mCall2Proto.direction = VOICE_CALL_SESSION__DIRECTION__CALL_DIRECTION_MT;

        mCall2Proto.setupDuration =

                VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_VERY_FAST;

        mCall2Proto.setupFailed = false;

        mCall2Proto.disconnectReasonCode = ImsReasonInfo.CODE_USER_TERMINATED_BY_REMOTE;

        mCall2Proto.disconnectExtraCode = 0;
@@ -285,8 +278,6 @@ public class PersistAtomsStorageTest extends TelephonyTest { 
        mCall3Proto.bearerAtStart = VOICE_CALL_SESSION__BEARER_AT_END__CALL_BEARER_IMS;

        mCall3Proto.bearerAtEnd = VOICE_CALL_SESSION__BEARER_AT_END__CALL_BEARER_IMS;

        mCall3Proto.direction = VOICE_CALL_SESSION__DIRECTION__CALL_DIRECTION_MT;

        mCall3Proto.setupDuration =

                VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_EXTREMELY_FAST;

        mCall3Proto.setupFailed = false;

        mCall3Proto.disconnectReasonCode = ImsReasonInfo.CODE_USER_TERMINATED;

        mCall3Proto.disconnectExtraCode = 0;
@@ -313,8 +304,6 @@ public class PersistAtomsStorageTest extends TelephonyTest { 
        mCall4Proto.bearerAtStart = VOICE_CALL_SESSION__BEARER_AT_END__CALL_BEARER_CS;

        mCall4Proto.bearerAtEnd = VOICE_CALL_SESSION__BEARER_AT_END__CALL_BEARER_CS;

        mCall4Proto.direction = VOICE_CALL_SESSION__DIRECTION__CALL_DIRECTION_MO;

        mCall4Proto.setupDuration =

                VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_VERY_SLOW;

        mCall4Proto.setupFailed = true;

        mCall4Proto.disconnectReasonCode = DisconnectCause.NORMAL;

        mCall4Proto.disconnectExtraCode = 0;

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

+0 −48
Original line number Diff line number Diff line
@@ -30,10 +30,6 @@ import static com.android.internal.telephony.TelephonyStatsLog.VOICE_CALL_SESSIO 
import static com.android.internal.telephony.TelephonyStatsLog.VOICE_CALL_SESSION__MAIN_CODEC_QUALITY__CODEC_QUALITY_NARROWBAND;

import static com.android.internal.telephony.TelephonyStatsLog.VOICE_CALL_SESSION__MAIN_CODEC_QUALITY__CODEC_QUALITY_SUPER_WIDEBAND;

import static com.android.internal.telephony.TelephonyStatsLog.VOICE_CALL_SESSION__MAIN_CODEC_QUALITY__CODEC_QUALITY_UNKNOWN;

import static com.android.internal.telephony.TelephonyStatsLog.VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_EXTREMELY_FAST;

import static com.android.internal.telephony.TelephonyStatsLog.VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_ULTRA_FAST;

import static com.android.internal.telephony.TelephonyStatsLog.VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_UNKNOWN;

import static com.android.internal.telephony.TelephonyStatsLog.VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_VERY_SLOW;



import static com.google.common.truth.Truth.assertThat;

import static com.google.common.truth.Truth.assertWithMessage;
@@ -228,8 +224,6 @@ public class VoiceCallSessionStatsTest extends TelephonyTest { 
                        VOICE_CALL_SESSION__DIRECTION__CALL_DIRECTION_MO,

                        TelephonyManager.NETWORK_TYPE_LTE,

                        ImsReasonInfo.CODE_REMOTE_CALL_DECLINE);

        expectedCall.setupDuration =

                VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_EXTREMELY_FAST;

        expectedCall.setupDurationMillis = 200;

        expectedCall.setupFailed = true;

        expectedCall.ratAtConnected = TelephonyManager.NETWORK_TYPE_UNKNOWN;
@@ -324,8 +318,6 @@ public class VoiceCallSessionStatsTest extends TelephonyTest { 
                        VOICE_CALL_SESSION__DIRECTION__CALL_DIRECTION_MO,

                        TelephonyManager.NETWORK_TYPE_LTE,

                        ImsReasonInfo.CODE_USER_TERMINATED_BY_REMOTE);

        expectedCall.setupDuration =

                VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_EXTREMELY_FAST;

        expectedCall.setupDurationMillis = 200;

        expectedCall.setupFailed = false;

        expectedCall.codecBitmask = 1L << AudioCodec.AUDIO_CODEC_EVS_SWB;
@@ -432,8 +424,6 @@ public class VoiceCallSessionStatsTest extends TelephonyTest { 
                        VOICE_CALL_SESSION__DIRECTION__CALL_DIRECTION_MT,

                        TelephonyManager.NETWORK_TYPE_LTE,

                        ImsReasonInfo.CODE_USER_TERMINATED);

        expectedCall.setupDuration =

                VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_EXTREMELY_FAST;

        expectedCall.setupDurationMillis = 80;

        expectedCall.setupFailed = false;

        expectedCall.codecBitmask = 1L << AudioCodec.AUDIO_CODEC_AMR;
@@ -704,8 +694,6 @@ public class VoiceCallSessionStatsTest extends TelephonyTest { 
                        VOICE_CALL_SESSION__DIRECTION__CALL_DIRECTION_MT,

                        TelephonyManager.NETWORK_TYPE_LTE,

                        ImsReasonInfo.CODE_USER_TERMINATED);

        expectedCall.setupDuration =

                VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_EXTREMELY_FAST;

        expectedCall.setupDurationMillis = 80;

        expectedCall.setupFailed = false;

        expectedCall.codecBitmask =
@@ -758,8 +746,6 @@ public class VoiceCallSessionStatsTest extends TelephonyTest { 
                        VOICE_CALL_SESSION__DIRECTION__CALL_DIRECTION_MT,

                        TelephonyManager.NETWORK_TYPE_LTE,

                        ImsReasonInfo.CODE_USER_TERMINATED);

        expectedCall.setupDuration =

                VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_EXTREMELY_FAST;

        expectedCall.setupDurationMillis = 80;

        expectedCall.setupFailed = false;

        expectedCall.codecBitmask = 1L << AudioCodec.AUDIO_CODEC_AMR;
@@ -876,8 +862,6 @@ public class VoiceCallSessionStatsTest extends TelephonyTest { 
                        VOICE_CALL_SESSION__DIRECTION__CALL_DIRECTION_MT,

                        TelephonyManager.NETWORK_TYPE_LTE,

                        ImsReasonInfo.CODE_USER_TERMINATED);

        expectedCall.setupDuration =

                VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_EXTREMELY_FAST;

        expectedCall.setupDurationMillis = 80;

        expectedCall.setupFailed = false;

        expectedCall.codecBitmask = 1L << AudioCodec.AUDIO_CODEC_AMR;
@@ -929,8 +913,6 @@ public class VoiceCallSessionStatsTest extends TelephonyTest { 
                        VOICE_CALL_SESSION__DIRECTION__CALL_DIRECTION_MO,

                        TelephonyManager.NETWORK_TYPE_LTE,

                        ImsReasonInfo.CODE_USER_TERMINATED_BY_REMOTE);

        expectedCall0.setupDuration =

                VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_EXTREMELY_FAST;

        expectedCall0.setupDurationMillis = 80;

        expectedCall0.setupFailed = false;

        expectedCall0.codecBitmask = 1L << AudioCodec.AUDIO_CODEC_AMR;
@@ -952,8 +934,6 @@ public class VoiceCallSessionStatsTest extends TelephonyTest { 
                        VOICE_CALL_SESSION__DIRECTION__CALL_DIRECTION_MT,

                        TelephonyManager.NETWORK_TYPE_LTE,

                        ImsReasonInfo.CODE_USER_TERMINATED);

        expectedCall1.setupDuration =

                VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_EXTREMELY_FAST;

        expectedCall1.setupDurationMillis = 20;

        expectedCall1.setupFailed = false;

        expectedCall1.codecBitmask = 1L << AudioCodec.AUDIO_CODEC_AMR;
@@ -1057,8 +1037,6 @@ public class VoiceCallSessionStatsTest extends TelephonyTest { 
                        VOICE_CALL_SESSION__DIRECTION__CALL_DIRECTION_MO,

                        TelephonyManager.NETWORK_TYPE_LTE,

                        ImsReasonInfo.CODE_USER_TERMINATED);

        expectedCall0.setupDuration =

                VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_EXTREMELY_FAST;

        expectedCall0.setupDurationMillis = 80;

        expectedCall0.setupFailed = false;

        expectedCall0.codecBitmask = 1L << AudioCodec.AUDIO_CODEC_AMR;
@@ -1080,8 +1058,6 @@ public class VoiceCallSessionStatsTest extends TelephonyTest { 
                        VOICE_CALL_SESSION__DIRECTION__CALL_DIRECTION_MT,

                        TelephonyManager.NETWORK_TYPE_LTE,

                        ImsReasonInfo.CODE_USER_TERMINATED_BY_REMOTE);

        expectedCall1.setupDuration =

                VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_EXTREMELY_FAST;

        expectedCall1.setupDurationMillis = 20;

        expectedCall1.setupFailed = false;

        expectedCall1.codecBitmask = 1L << AudioCodec.AUDIO_CODEC_AMR;
@@ -1185,8 +1161,6 @@ public class VoiceCallSessionStatsTest extends TelephonyTest { 
                        VOICE_CALL_SESSION__DIRECTION__CALL_DIRECTION_MO,

                        TelephonyManager.NETWORK_TYPE_LTE,

                        ImsReasonInfo.CODE_USER_TERMINATED);

        expectedCall0.setupDuration =

                VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_EXTREMELY_FAST;

        expectedCall0.setupDurationMillis = 80;

        expectedCall0.setupFailed = false;

        expectedCall0.codecBitmask = 1L << AudioCodec.AUDIO_CODEC_AMR;
@@ -1207,8 +1181,6 @@ public class VoiceCallSessionStatsTest extends TelephonyTest { 
                        VOICE_CALL_SESSION__DIRECTION__CALL_DIRECTION_MT,

                        TelephonyManager.NETWORK_TYPE_LTE,

                        ImsReasonInfo.CODE_USER_TERMINATED_BY_REMOTE);

        expectedCall1.setupDuration =

                VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_EXTREMELY_FAST;

        expectedCall1.setupDurationMillis = 20;

        expectedCall1.setupFailed = false;

        expectedCall1.codecBitmask = 1L << AudioCodec.AUDIO_CODEC_AMR;
@@ -1298,8 +1270,6 @@ public class VoiceCallSessionStatsTest extends TelephonyTest { 
                        DisconnectCause.NORMAL);

        expectedCall.ratAtEnd = TelephonyManager.NETWORK_TYPE_UMTS;

        expectedCall.bandAtEnd = 0;

        expectedCall.setupDuration =

                VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_VERY_SLOW;

        expectedCall.setupDurationMillis = 5000;

        expectedCall.disconnectExtraCode = PreciseDisconnectCause.CALL_REJECTED;

        expectedCall.ratSwitchCount = 1L;
@@ -1416,8 +1386,6 @@ public class VoiceCallSessionStatsTest extends TelephonyTest { 
        expectedCall.ratAtConnected = TelephonyManager.NETWORK_TYPE_UMTS;

        expectedCall.ratAtEnd = TelephonyManager.NETWORK_TYPE_UMTS;

        expectedCall.bandAtEnd = 0;

        expectedCall.setupDuration =

                VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_VERY_SLOW;

        expectedCall.setupDurationMillis = 5000;

        expectedCall.disconnectExtraCode = PreciseDisconnectCause.NORMAL;

        expectedCall.ratSwitchCount = 1L;
@@ -1481,8 +1449,6 @@ public class VoiceCallSessionStatsTest extends TelephonyTest { 
                        VOICE_CALL_SESSION__DIRECTION__CALL_DIRECTION_MT,

                        TelephonyManager.NETWORK_TYPE_UMTS,

                        DisconnectCause.NORMAL);

        expectedCall.setupDuration =

                VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_UNKNOWN;

        expectedCall.setupDurationMillis = 0;

        expectedCall.disconnectExtraCode = PreciseDisconnectCause.CALL_REJECTED;

        expectedCall.setupFailed = true;
@@ -1538,8 +1504,6 @@ public class VoiceCallSessionStatsTest extends TelephonyTest { 
                        VOICE_CALL_SESSION__DIRECTION__CALL_DIRECTION_MT,

                        TelephonyManager.NETWORK_TYPE_UMTS,

                        DisconnectCause.NORMAL);

        expectedCall.setupDuration =

                VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_ULTRA_FAST;

        expectedCall.setupDurationMillis = 500;

        expectedCall.disconnectExtraCode = PreciseDisconnectCause.NORMAL;

        expectedCall.setupFailed = false;
@@ -1598,8 +1562,6 @@ public class VoiceCallSessionStatsTest extends TelephonyTest { 
                        VOICE_CALL_SESSION__DIRECTION__CALL_DIRECTION_MT,

                        TelephonyManager.NETWORK_TYPE_LTE,

                        ImsReasonInfo.CODE_LOCAL_HO_NOT_FEASIBLE);

        expectedCall.setupDuration =

                VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_EXTREMELY_FAST;

        expectedCall.setupDurationMillis = 80;

        expectedCall.setupFailed = false;

        expectedCall.srvccFailureCount = 2L;
@@ -1676,8 +1638,6 @@ public class VoiceCallSessionStatsTest extends TelephonyTest { 
                        VOICE_CALL_SESSION__DIRECTION__CALL_DIRECTION_MT,

                        TelephonyManager.NETWORK_TYPE_LTE,

                        ImsReasonInfo.CODE_USER_TERMINATED);

        expectedCall.setupDuration =

                VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_EXTREMELY_FAST;

        expectedCall.setupDurationMillis = 80;

        expectedCall.setupFailed = false;

        expectedCall.srvccCancellationCount = 2L;
@@ -1747,8 +1707,6 @@ public class VoiceCallSessionStatsTest extends TelephonyTest { 
                        TelephonyManager.NETWORK_TYPE_LTE,

                        DisconnectCause.NORMAL);

        expectedCall.disconnectExtraCode = PreciseDisconnectCause.NORMAL;

        expectedCall.setupDuration =

                VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_EXTREMELY_FAST;

        expectedCall.setupDurationMillis = 80;

        expectedCall.setupFailed = false;

        expectedCall.srvccCancellationCount = 1L;
@@ -1843,8 +1801,6 @@ public class VoiceCallSessionStatsTest extends TelephonyTest { 
                        TelephonyManager.NETWORK_TYPE_LTE,

                        DisconnectCause.NORMAL);

        expectedCall0.disconnectExtraCode = PreciseDisconnectCause.NORMAL;

        expectedCall0.setupDuration =

                VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_EXTREMELY_FAST;

        expectedCall0.setupDurationMillis = 80;

        expectedCall0.setupFailed = false;

        expectedCall0.codecBitmask = 1L << AudioCodec.AUDIO_CODEC_AMR;
@@ -1871,8 +1827,6 @@ public class VoiceCallSessionStatsTest extends TelephonyTest { 
                        TelephonyManager.NETWORK_TYPE_LTE,

                        DisconnectCause.NORMAL);

        expectedCall1.disconnectExtraCode = PreciseDisconnectCause.NORMAL;

        expectedCall1.setupDuration =

                VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_EXTREMELY_FAST;

        expectedCall1.setupDurationMillis = 20;

        expectedCall1.setupFailed = false;

        expectedCall1.codecBitmask = 1L << AudioCodec.AUDIO_CODEC_AMR;
@@ -2101,7 +2055,6 @@ public class VoiceCallSessionStatsTest extends TelephonyTest { 
        call.bearerAtStart = bearer;

        call.bearerAtEnd = bearer;

        call.direction = direction;

        call.setupDuration = VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_UNKNOWN;

        call.setupDurationMillis = 0;

        call.setupFailed = true;

        call.disconnectReasonCode = reason;
@@ -2135,7 +2088,6 @@ public class VoiceCallSessionStatsTest extends TelephonyTest { 
        call.bearerAtStart = bearer;

        call.bearerAtEnd = bearer;

        call.direction = direction;

        call.setupDuration = VOICE_CALL_SESSION__SETUP_DURATION__CALL_SETUP_DURATION_UNKNOWN;

        call.setupDurationMillis = 0;

        call.setupFailed = true;

        call.disconnectReasonCode = reason;