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

Commit d5db19f2 authored by Willy Hu's avatar Willy Hu
Browse files

Add metrics for data stall recovery enhancement 

MDR: https://eldar.corp.google.com/assessments/296451350/drafts/988759905?jsmode=o

Bug: 260166714
Test: atest DataStallRecoveryManagerTest passed
      Telephony sanity test passed. Result: b/269436482.

Change-Id: I173e936315c9976a4dcbc592273e74388233f90b
Merged-In: I173e936315c9976a4dcbc592273e74388233f90b
parent f7407c5e

src/java/com/android/internal/telephony/data/DataStallRecoveryManager.java

+35 −19
Original line number Diff line number Diff line
@@ -587,38 +587,54 @@ public class DataStallRecoveryManager extends Handler { 
     * @param isValid true for validation passed & false for validation failed

     */

    private void setNetworkValidationState(boolean isValid) {

        boolean isLogNeeded = false;

        int timeDuration = 0;

        boolean isFirstDataStall = false;

        boolean isFirstValidationAfterDoRecovery = false;

        @RecoveredReason int reason = getRecoveredReason(isValid);

        // Validation status is true and was not data stall.

        if (isValid && !mDataStalled) {

            return;

        }



        if (!mDataStalled) {

            // First data stall

            isLogNeeded = true;

            mDataStalled = true;

            mDataStallStartMs = SystemClock.elapsedRealtime();

            logl("data stall: start time = " + DataUtils.elapsedTimeToString(mDataStallStartMs));

            return;

            isFirstDataStall = true;

        } else if (!mLastActionReported) {

            // When the first validation status appears, enter this block.

            isLogNeeded = true;

            timeDuration = (int) (SystemClock.elapsedRealtime() - mDataStallStartMs);

            mLastActionReported = true;

            isFirstValidationAfterDoRecovery = true;

        }



        if (!mLastActionReported) {

            @RecoveredReason int reason = getRecoveredReason(isValid);

            int timeDuration = (int) (SystemClock.elapsedRealtime() - mDataStallStartMs);

        if (isValid) {

            // When the validation passed(mobile data resume), enter this block.

            isLogNeeded = true;

            timeDuration = (int) (SystemClock.elapsedRealtime() - mDataStallStartMs);

            mLastActionReported = false;

            mDataStalled = false;

        }



        if (isLogNeeded) {

            DataStallRecoveryStats.onDataStallEvent(

                    mLastAction, mPhone, isValid, timeDuration, reason,

                    isFirstValidationAfterDoRecovery);

            logl(

                    "data stall: lastaction = "

                    "data stall: "

                    + (isFirstDataStall == true ? "start" : isValid == false ? "in process" : "end")

                    + ", lastaction="

                    + recoveryActionToString(mLastAction)

                    + ", isRecovered="

                    + isValid

                    + ", reason="

                    + recoveredReasonToString(reason)

                    + ", isFirstValidationAfterDoRecovery="

                    + isFirstValidationAfterDoRecovery

                    + ", TimeDuration="

                    + timeDuration);

            DataStallRecoveryStats.onDataStallEvent(

                    mLastAction, mPhone, isValid, timeDuration, reason);

            mLastActionReported = true;

        }



        if (isValid) {

            mLastActionReported = false;

            mDataStalled = false;

        }

    }

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

+44 −4
Original line number Diff line number Diff line
@@ -16,7 +16,10 @@ 


package com.android.internal.telephony.metrics;



import android.telephony.AccessNetworkConstants;

import android.telephony.Annotation.NetworkType;

import android.telephony.CellSignalStrength;

import android.telephony.NetworkRegistrationInfo;

import android.telephony.ServiceState;

import android.telephony.TelephonyManager;
@@ -61,8 +64,15 @@ public class DataStallRecoveryStats { 
        boolean isOpportunistic = getIsOpportunistic(phone);

        boolean isMultiSim = SimSlotState.getCurrentState().numActiveSims > 1;



        // Not use this field in Android S, so we send RECOVERED_REASON_NONE for default value.

        // Not use these fields in Android S, so we set below parameter for default value.

        int recoveryReason = 0;

        int otherSignalStrength = CellSignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN;

        int otherNetworkRegState = NetworkRegistrationInfo

                .REGISTRATION_STATE_NOT_REGISTERED_OR_SEARCHING;

        int phoneNetworkRegState = NetworkRegistrationInfo

                .REGISTRATION_STATE_NOT_REGISTERED_OR_SEARCHING;

        boolean isFirstValidation = false;

        int phoneId = 0;

        TelephonyStatsLog.write(

                TelephonyStatsLog.DATA_STALL_RECOVERY_REPORTED,

                carrierId,
@@ -74,7 +84,12 @@ public class DataStallRecoveryStats { 
                band,

                isRecovered,

                durationMillis,

                recoveryReason);

                recoveryReason,

                otherSignalStrength,

                otherNetworkRegState,

                phoneNetworkRegState,

                isFirstValidation,

                phoneId);

    }



    /**
@@ -85,13 +100,15 @@ public class DataStallRecoveryStats { 
     * @param isRecovered The data stall symptom recovered or not.

     * @param durationMillis The duration from data stall symptom occurred.

     * @param reason The recovered(data resume) reason.

     * @param isFirstValidation The validation status if it's the first come after recovery.

     */

    public static void onDataStallEvent(

            @DataStallRecoveryManager.RecoveryAction int recoveryAction,

            Phone phone,

            boolean isRecovered,

            int durationMillis,

            @DataStallRecoveryManager.RecoveredReason int reason) {

            @DataStallRecoveryManager.RecoveredReason int reason,

            boolean isFirstValidation) {

        if (phone.getPhoneType() == PhoneConstants.PHONE_TYPE_IMS) {

            phone = phone.getDefaultPhone();

        }
@@ -111,6 +128,24 @@ public class DataStallRecoveryStats { 
            recoveryAction = RECOVERY_ACTION_RESET_MODEM_MAPPING;

        }



        // collect info of the other device in case of DSDS

        int otherSignalStrength = CellSignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN;

        // the number returned here matches the NetworkRegistrationState enum we have

        int otherNetworkRegState = NetworkRegistrationInfo

                .REGISTRATION_STATE_NOT_REGISTERED_OR_SEARCHING;

        // the number returned here matches the NetworkRegistrationState enum we have

        int phoneNetworkRegState = NetworkRegistrationInfo

                .REGISTRATION_STATE_NOT_REGISTERED_OR_SEARCHING;



        NetworkRegistrationInfo phoneRegInfo = phone.getServiceState()

                        .getNetworkRegistrationInfo(NetworkRegistrationInfo.DOMAIN_PS,

                                AccessNetworkConstants.TRANSPORT_TYPE_WWAN);

        if (phoneRegInfo != null) {

            phoneNetworkRegState = phoneRegInfo.getRegistrationState();

        }



        int phoneId = phone.getPhoneId();



        TelephonyStatsLog.write(

                TelephonyStatsLog.DATA_STALL_RECOVERY_REPORTED,

                carrierId,
@@ -122,7 +157,12 @@ public class DataStallRecoveryStats { 
                band,

                isRecovered,

                durationMillis,

                reason);

                reason,

                otherSignalStrength,

                otherNetworkRegState,

                phoneNetworkRegState,

                isFirstValidation,

                phoneId);

    }



    /** Returns the RAT used for data (including IWLAN). */