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

Commit 2003f5c2 authored by Chi Zhang's avatar Chi Zhang Committed by Android (Google) Code Review
Browse files

Merge changes from topic "presubmit-am-7c803c7e27774183999bf7d44566e148" into tm-qpr-dev-plus-aosp 

* changes:
  [automerge] Mitigate VoNR/EPSFB metrics issue in T QPR3 2p: 33e9c4fe
  Mitigate VoNR/EPSFB metrics issue in T QPR3
parents 949031da 47713928

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

+58 −25
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import android.telecom.VideoProfile.VideoState; 
import android.telephony.Annotation.NetworkType;

import android.telephony.AnomalyReporter;

import android.telephony.DisconnectCause;

import android.telephony.NetworkRegistrationInfo;

import android.telephony.ServiceState;

import android.telephony.TelephonyManager;

import android.telephony.ims.ImsReasonInfo;
@@ -63,6 +64,7 @@ import com.android.internal.telephony.Phone; 
import com.android.internal.telephony.PhoneConstants;

import com.android.internal.telephony.PhoneFactory;

import com.android.internal.telephony.ServiceStateTracker;

import com.android.internal.telephony.imsphone.ImsPhone;

import com.android.internal.telephony.imsphone.ImsPhoneConnection;

import com.android.internal.telephony.nano.PersistAtomsProto.VoiceCallSession;

import com.android.internal.telephony.nano.TelephonyProto.TelephonyCallSession.Event.AudioCodec;
@@ -366,9 +368,8 @@ public class VoiceCallSessionStats { 
                    proto.srvccCompleted = true;

                    proto.bearerAtEnd = VOICE_CALL_SESSION__BEARER_AT_END__CALL_BEARER_CS;

                    // Call RAT may have changed (e.g. IWLAN -> UMTS) due to bearer change

                    proto.ratAtEnd =

                            ServiceStateStats.getVoiceRat(

                                    mPhone, mPhone.getServiceState(), proto.bearerAtEnd);

                    updateRatAtEnd(proto, getVoiceRatWithVoNRFix(

                            mPhone, mPhone.getServiceState(), proto.bearerAtEnd));

                }

                break;

            case TelephonyManager.SRVCC_STATE_HANDOVER_FAILED:
@@ -422,8 +423,7 @@ public class VoiceCallSessionStats { 
        }

        int bearer = getBearer(conn);

        ServiceState serviceState = getServiceState();

        @NetworkType int rat = ServiceStateStats.getVoiceRat(mPhone, serviceState, bearer);



        @NetworkType int rat = getVoiceRatWithVoNRFix(mPhone, serviceState, bearer);

        VoiceCallSession proto = new VoiceCallSession();



        proto.bearerAtStart = bearer;
@@ -512,15 +512,7 @@ public class VoiceCallSessionStats { 
        }



        // 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;

            }

        }

        updateRatAtEnd(proto, getVoiceRatWithVoNRFix(mPhone, getServiceState(), proto.bearerAtEnd));



        mAtomsStorage.addVoiceCallSession(proto);
@@ -581,8 +573,7 @@ public class VoiceCallSessionStats { 
            proto.setupFailed = false;

            // Track RAT when voice call is connected.

            ServiceState serviceState = getServiceState();

            proto.ratAtConnected =

                    ServiceStateStats.getVoiceRat(mPhone, serviceState, proto.bearerAtEnd);

            proto.ratAtConnected = getVoiceRatWithVoNRFix(mPhone, serviceState, proto.bearerAtEnd);

            // Reset list of codecs with the last codec at the present time. In this way, we

            // track codec quality only after call is connected and not while ringing.

            resetCodecList(conn);
@@ -593,12 +584,22 @@ public class VoiceCallSessionStats { 
        // RAT usage is not broken down by bearer. In case a CS call is made while there is IMS

        // voice registration, this may be inaccurate (i.e. there could be multiple RAT in use, but

        // we only pick the most feasible one).

        @NetworkType int rat = ServiceStateStats.getVoiceRat(mPhone, state);

        @NetworkType int rat = getVoiceRatWithVoNRFix(mPhone, state,

                VOICE_CALL_SESSION__BEARER_AT_END__CALL_BEARER_UNKNOWN);

        mRatUsage.add(mPhone.getCarrierId(), rat, getTimeMillis(), getConnectionIds());



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

            VoiceCallSession proto = mCallProtos.valueAt(i);

            rat = ServiceStateStats.getVoiceRat(mPhone, state, proto.bearerAtEnd);

            rat = getVoiceRatWithVoNRFix(mPhone, state, proto.bearerAtEnd);

            updateRatAtEnd(proto, rat);

            proto.bandAtEnd = (rat == TelephonyManager.NETWORK_TYPE_IWLAN)

                            ? 0

                            : ServiceStateStats.getBand(state);

            // assuming that SIM carrier ID does not change during the call

        }

    }



    private void updateRatAtEnd(VoiceCallSession proto, @NetworkType int rat) {

        if (proto.ratAtEnd != rat) {

            proto.ratSwitchCount++;

            proto.ratAtEnd = rat;
@@ -606,11 +607,6 @@ public class VoiceCallSessionStats { 
                proto.lastKnownRat = rat;

            }

        }

            proto.bandAtEnd = (rat == TelephonyManager.NETWORK_TYPE_IWLAN)

                            ? 0

                            : ServiceStateStats.getBand(state);

            // assuming that SIM carrier ID does not change during the call

        }

    }



    private void finishImsCall(int id, ImsReasonInfo reasonInfo, long durationMillis) {
@@ -679,6 +675,43 @@ public class VoiceCallSessionStats { 
        return mPhone.getSignalStrength().getLevel();

    }



    /**

     * This is a copy of ServiceStateStats.getVoiceRat(Phone, ServiceState, int) with minimum fix

     * required for tracking EPSFB correctly.

     */

    @VisibleForTesting private static @NetworkType int getVoiceRatWithVoNRFix(

            Phone phone, @Nullable ServiceState state, int bearer) {

        if (state == null) {

            return TelephonyManager.NETWORK_TYPE_UNKNOWN;

        }

        ImsPhone imsPhone = (ImsPhone) phone.getImsPhone();

        if (bearer != VOICE_CALL_SESSION__BEARER_AT_END__CALL_BEARER_CS && imsPhone != null) {

            @NetworkType int imsVoiceRat = imsPhone.getImsStats().getImsVoiceRadioTech();

            @NetworkType int wwanPsRat =

                    ServiceStateStats.getRat(state, NetworkRegistrationInfo.DOMAIN_PS);

            if (imsVoiceRat != TelephonyManager.NETWORK_TYPE_UNKNOWN) {

                // If IMS is registered over WWAN but WWAN PS is not in service,

                // fallback to WWAN CS RAT

                boolean isImsVoiceRatValid =

                        (imsVoiceRat == TelephonyManager.NETWORK_TYPE_IWLAN

                                || wwanPsRat != TelephonyManager.NETWORK_TYPE_UNKNOWN);

                if (isImsVoiceRatValid) {

                    // Fix for VoNR and EPSFB, b/277906557

                    @NetworkType int oldRat = ServiceStateStats.getVoiceRat(phone, state, bearer),

                            rat = imsVoiceRat == TelephonyManager.NETWORK_TYPE_IWLAN

                                    ? imsVoiceRat : wwanPsRat;

                    logd("getVoiceRatWithVoNRFix: oldRat=%d, newRat=%d", oldRat, rat);

                    return rat;

                }

            }

        }

        if (bearer == VOICE_CALL_SESSION__BEARER_AT_END__CALL_BEARER_IMS) {

            return TelephonyManager.NETWORK_TYPE_UNKNOWN;

        } else {

            return ServiceStateStats.getRat(state, NetworkRegistrationInfo.DOMAIN_CS);

        }

    }



    /** Resets the list of codecs used for the connection with only the codec currently in use. */

    private void resetCodecList(Connection conn) {

        int id = getConnectionId(conn);