Merge changes from topic "data-stall-metrics" am: fa92b3f74e (36265407) · Commits · e / os / android_frameworks_opt_telephony

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

+69 −5

Original line number	Original line	Diff line number	Diff line
	@@ -74,23 +74,45 @@ public class DataStallRecoveryManager extends Handler {
	* etc) using RIL_REQUEST_GET_DATA_CALL_LIST. This will help in cases where the data stall		* etc) using RIL_REQUEST_GET_DATA_CALL_LIST. This will help in cases where the data stall
	* occurred because of a link property changed but not notified to connectivity service.		* occurred because of a link property changed but not notified to connectivity service.
	*/		*/
	private static final int RECOVERY_ACTION_GET_DATA_CALL_LIST = 0;		public static final int RECOVERY_ACTION_GET_DATA_CALL_LIST = 0;

	/* DataStallRecoveryManager will request DataNetworkController to reestablish internet using		/* DataStallRecoveryManager will request DataNetworkController to reestablish internet using
	* RIL_REQUEST_DEACTIVATE_DATA_CALL and sets up the data call back using SETUP_DATA_CALL.		* RIL_REQUEST_DEACTIVATE_DATA_CALL and sets up the data call back using SETUP_DATA_CALL.
	* It will help to reestablish the channel between RIL and modem.		* It will help to reestablish the channel between RIL and modem.
	*/		*/
	private static final int RECOVERY_ACTION_CLEANUP = 1;		public static final int RECOVERY_ACTION_CLEANUP = 1;

			// TODO: b/214662910: Align the recovery action between DataStallRecoveryManager and Westworld.
	/* DataStallRecoveryManager will request ServiceStateTracker to send RIL_REQUEST_RADIO_POWER		/* DataStallRecoveryManager will request ServiceStateTracker to send RIL_REQUEST_RADIO_POWER
	* to restart radio. It will restart the radio and re-attch to the network.		* to restart radio. It will restart the radio and re-attch to the network.
	*/		*/
	private static final int RECOVERY_ACTION_RADIO_RESTART = 2;		public static final int RECOVERY_ACTION_RADIO_RESTART = 2;

	/* DataStallRecoveryManager will request to reboot modem using NV_RESET_CONFIG. It will recover		/* DataStallRecoveryManager will request to reboot modem using NV_RESET_CONFIG. It will recover
	* if there is a problem in modem side.		* if there is a problem in modem side.
	*/		*/
	private static final int RECOVERY_ACTION_RESET_MODEM = 3;		public static final int RECOVERY_ACTION_RESET_MODEM = 3;

			/** Recovered reason taken in case of data stall recovered */
			@IntDef(
			value = {
			RECOVERED_REASON_NONE,
			RECOVERED_REASON_DSRM,
			RECOVERED_REASON_MODEM,
			RECOVERED_REASON_USER
			})
			@Retention(RetentionPolicy.SOURCE)
			public @interface RecoveredReason {};

			/** The reason when data stall recovered. */
			/** The data stall not recovered yet. */
			private static final int RECOVERED_REASON_NONE = 0;
			/** The data stall recovered by our DataStallRecoveryManager. */
			private static final int RECOVERED_REASON_DSRM = 1;
			/** The data stall recovered by modem(Radio Power off/on). */
			private static final int RECOVERED_REASON_MODEM = 2;
			/** The data stall recovered by user (Mobile Data Power off/on). */
			private static final int RECOVERED_REASON_USER = 3;

	/** Event for data config updated. */		/** Event for data config updated. */
	private static final int EVENT_DATA_CONFIG_UPDATED = 1;		private static final int EVENT_DATA_CONFIG_UPDATED = 1;
	@@ -518,15 +540,19 @@ public class DataStallRecoveryManager extends Handler {
	}		}

	if (!mLastActionReported) {		if (!mLastActionReported) {
			@RecoveredReason int reason = getRecoveredReason(isValid);
	int timeDuration = (int) (SystemClock.elapsedRealtime() - mDataStallStartMs);		int timeDuration = (int) (SystemClock.elapsedRealtime() - mDataStallStartMs);
	logl(		logl(
	"data stall: lastaction = "		"data stall: lastaction = "
	+ recoveryActionToString(mLastAction)		+ recoveryActionToString(mLastAction)
	+ ", isRecovered = "		+ ", isRecovered = "
	+ isValid		+ isValid
			+ ", reason = "
			+ recoveredReasonToString(reason)
	+ ", TimeDuration = "		+ ", TimeDuration = "
	+ timeDuration);		+ timeDuration);
	DataStallRecoveryStats.onDataStallEvent(mLastAction, mPhone, isValid, timeDuration);		DataStallRecoveryStats.onDataStallEvent(
			mLastAction, mPhone, isValid, timeDuration, reason);
	mLastActionReported = true;		mLastActionReported = true;
	}		}

	@@ -536,6 +562,23 @@ public class DataStallRecoveryManager extends Handler {
	}		}
	}		}

			/**
			* Get the data stall recovered reason.
			*
			* @param isValid true for validation passed & false for validation failed
			*/
			private int getRecoveredReason(boolean isValid) {
			if (!isValid) return RECOVERED_REASON_NONE;

			if (mRadioStateChangedDuringDataStall) {
			return RECOVERED_REASON_MODEM;
			} else if (mMobileDataChangedToEnabledDuringDataStall) {
			return RECOVERED_REASON_USER;
			} else {
			return RECOVERED_REASON_DSRM;
			}
			}

	/** Perform a series of data stall recovery actions. */		/** Perform a series of data stall recovery actions. */
	private void doRecovery() {		private void doRecovery() {
	@RecoveryAction final int recoveryAction = getRecoveryAction();		@RecoveryAction final int recoveryAction = getRecoveryAction();
	@@ -578,6 +621,27 @@ public class DataStallRecoveryManager extends Handler {
	startNetworkCheckTimer(mLastAction);		startNetworkCheckTimer(mLastAction);
	}		}

			/**
			* Convert @RecoveredReason to string
			*
			* @param reason The recovered reason.
			* @return The recovered reason in string format.
			*/
			private static @NonNull String recoveredReasonToString(@RecoveredReason int reason) {
			switch (reason) {
			case RECOVERED_REASON_NONE:
			return "RECOVERED_REASON_NONE";
			case RECOVERED_REASON_DSRM:
			return "RECOVERED_REASON_DSRM";
			case RECOVERED_REASON_MODEM:
			return "RECOVERED_REASON_MODEM";
			case RECOVERED_REASON_USER:
			return "RECOVERED_REASON_USER";
			default:
			return "Unknown(" + reason + ")";
			}
			}

	/**		/**
	* Convert RadioPowerState to string		* Convert RadioPowerState to string
	*		*

src/java/com/android/internal/telephony/dataconnection/DcTracker.java

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -357,9 +357,6 @@ public class DcTracker extends Handler {
	// it effect the PhysicalLinkStatusChanged		// it effect the PhysicalLinkStatusChanged
	private boolean mLteEndcUsingUserDataForRrcDetection = false;		private boolean mLteEndcUsingUserDataForRrcDetection = false;

	// stats per data call recovery event
	private DataStallRecoveryStats mDataStallRecoveryStats;

	/* List of SubscriptionPlans, updated when initialized and when plans are changed. */		/* List of SubscriptionPlans, updated when initialized and when plans are changed. */
	private List<SubscriptionPlan> mSubscriptionPlans = null;		private List<SubscriptionPlan> mSubscriptionPlans = null;
	/* List of network types an unmetered override applies to, set by onSubscriptionOverride		/* List of network types an unmetered override applies to, set by onSubscriptionOverride