Merge "Update default timeout value for network in transit state" (680acedf) · Commits · e / os / android_frameworks_opt_telephony

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

+6 −5

Original line number	Diff line number	Diff line
		@@ -72,8 +72,8 @@ import java.util.stream.Collectors;
		* {@link CarrierConfigManager}. All the data config will be loaded once and stored here.
		*/
		public class DataConfigManager extends Handler {
		/** The max timeout in ms for data network stuck in a transit state. */
		public static final int MAX_NETWORK_TRANSIT_STATE_TIMEOUT_MS = 3600000;
		/** The default timeout in ms for data network stuck in a transit state. */
		private static final int DEFAULT_NETWORK_TRANSIT_STATE_TIMEOUT_MS = 300000;

		/** Event for carrier config changed. */
		private static final int EVENT_CARRIER_CONFIG_CHANGED = 1;
		@@ -417,11 +417,12 @@ public class DataConfigManager extends Handler {
		mIsInvalidQnsParamAnomalyReportEnabled = properties.getBoolean(
		KEY_ANOMALY_QNS_PARAM, false);
		mNetworkConnectingTimeout = properties.getInt(
		KEY_ANOMALY_NETWORK_CONNECTING_TIMEOUT, MAX_NETWORK_TRANSIT_STATE_TIMEOUT_MS);
		KEY_ANOMALY_NETWORK_CONNECTING_TIMEOUT, DEFAULT_NETWORK_TRANSIT_STATE_TIMEOUT_MS);
		mNetworkDisconnectingTimeout = properties.getInt(
		KEY_ANOMALY_NETWORK_DISCONNECTING_TIMEOUT, MAX_NETWORK_TRANSIT_STATE_TIMEOUT_MS);
		KEY_ANOMALY_NETWORK_DISCONNECTING_TIMEOUT,
		DEFAULT_NETWORK_TRANSIT_STATE_TIMEOUT_MS);
		mNetworkHandoverTimeout = properties.getInt(
		KEY_ANOMALY_NETWORK_HANDOVER_TIMEOUT, MAX_NETWORK_TRANSIT_STATE_TIMEOUT_MS);
		KEY_ANOMALY_NETWORK_HANDOVER_TIMEOUT, DEFAULT_NETWORK_TRANSIT_STATE_TIMEOUT_MS);
		}

		/**

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

+13 −25

Original line number	Diff line number	Diff line
		@@ -1187,14 +1187,10 @@ public class DataNetwork extends StateMachine {
		deferMessage(msg);
		break;
		case EVENT_STUCK_IN_TRANSIENT_STATE:
		// enable detection only for valid timeout range
		if (mDataConfigManager.getAnomalyNetworkConnectingTimeoutMs()
		< DataConfigManager.MAX_NETWORK_TRANSIT_STATE_TIMEOUT_MS) {
		reportAnomaly("Data network stuck in connecting state for "
		+ TimeUnit.MILLISECONDS.toSeconds(
		mDataConfigManager.getAnomalyNetworkConnectingTimeoutMs())
		+ " seconds.", "58c56403-7ea7-4e56-a0c7-e467114d09b8");
		}
		// Setup data failed. Use the retry logic defined in
		// CarrierConfigManager.KEY_TELEPHONY_DATA_SETUP_RETRY_RULES_STRING_ARRAY.
		mRetryDelayMillis = DataCallResponse.RETRY_DURATION_UNDEFINED;
		@@ -1383,14 +1379,10 @@ public class DataNetwork extends StateMachine {
		break;
		case EVENT_STUCK_IN_TRANSIENT_STATE:
		// enable detection only for valid timeout range
		if (mDataConfigManager.getNetworkHandoverTimeoutMs()
		< DataConfigManager.MAX_NETWORK_TRANSIT_STATE_TIMEOUT_MS) {
		reportAnomaly("Data service did not respond the handover request within "
		+ TimeUnit.MILLISECONDS.toSeconds(
		mDataConfigManager.getNetworkHandoverTimeoutMs()) + " seconds.",
		"1afe68cb-8b41-4964-a737-4f34372429ea");
		}

		// Handover failed. Use the retry logic defined in
		// CarrierConfigManager.KEY_TELEPHONY_DATA_HANDOVER_RETRY_RULES_STRING_ARRAY.
		long retry = DataCallResponse.RETRY_DURATION_UNDEFINED;
		@@ -1485,15 +1477,11 @@ public class DataNetwork extends StateMachine {
		// After frameworks issues deactivate data call request, RIL should report
		// data disconnected through data call list changed event subsequently.

		// enable detection only for valid timeout range
		if (mDataConfigManager.getAnomalyNetworkDisconnectingTimeoutMs()
		< DataConfigManager.MAX_NETWORK_TRANSIT_STATE_TIMEOUT_MS) {
		reportAnomaly("RIL did not send data call list changed event after "
		+ "deactivate data call request within "
		+ TimeUnit.MILLISECONDS.toSeconds(
		mDataConfigManager.getAnomalyNetworkDisconnectingTimeoutMs())
		+ " seconds.", "d0e4fa1c-c57b-4ba5-b4b6-8955487012cc");
		}
		mFailCause = DataFailCause.LOST_CONNECTION;
		transitionTo(mDisconnectedState);
		break;