Merge changes from topic "permanent_failure_cause" (9f4eac9e) · Commits · e / os / android_frameworks_opt_telephony

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

+45 −21

Original line number	Diff line number	Diff line
		@@ -195,50 +195,74 @@ public class DataEvaluation {
		@VisibleForTesting
		public enum DataEvaluationReason {
		/** New request from the apps. */
		NEW_REQUEST,
		NEW_REQUEST(false),
		/** Data config changed. */
		DATA_CONFIG_CHANGED,
		DATA_CONFIG_CHANGED(true),
		/** SIM is loaded. */
		SIM_LOADED,
		SIM_LOADED(true),
		/** SIM is removed. */
		SIM_REMOVAL,
		SIM_REMOVAL(true),
		/** Data profiles changed. */
		DATA_PROFILES_CHANGED,
		DATA_PROFILES_CHANGED(true),
		/** When service state changes.(For now only considering data RAT and data registration). */
		DATA_SERVICE_STATE_CHANGED,
		DATA_SERVICE_STATE_CHANGED(true),
		/** When data is enabled or disabled (by user, carrier, thermal, etc...) */
		DATA_ENABLED_CHANGED,
		DATA_ENABLED_CHANGED(true),
		/** When data enabled overrides are changed (MMS always allowed, data on non-DDS sub). */
		DATA_ENABLED_OVERRIDE_CHANGED,
		DATA_ENABLED_OVERRIDE_CHANGED(true),
		/** When data roaming is enabled or disabled. */
		ROAMING_ENABLED_CHANGED,
		ROAMING_ENABLED_CHANGED(true),
		/** When voice call ended (for concurrent voice/data not supported RAT). */
		VOICE_CALL_ENDED,
		VOICE_CALL_ENDED(true),
		/** When network restricts or no longer restricts mobile data. */
		DATA_RESTRICTED_CHANGED,
		DATA_RESTRICTED_CHANGED(true),
		/** Network capabilities changed. The unsatisfied requests might have chances to attach. */
		DATA_NETWORK_CAPABILITIES_CHANGED,
		DATA_NETWORK_CAPABILITIES_CHANGED(true),
		/** When emergency call started or ended. */
		EMERGENCY_CALL_CHANGED,
		EMERGENCY_CALL_CHANGED(true),
		/** When data disconnected, re-evaluate later to see if data could be brought up again. */
		RETRY_AFTER_DISCONNECTED,
		RETRY_AFTER_DISCONNECTED(true),
		/** Data setup retry. */
		DATA_RETRY,
		DATA_RETRY(false),
		/** For handover evaluation, or for network tearing down after handover succeeds/fails. */
		DATA_HANDOVER,
		DATA_HANDOVER(true),
		/** Preferred transport changed. */
		PREFERRED_TRANSPORT_CHANGED,
		PREFERRED_TRANSPORT_CHANGED(true),
		/** Slice config changed. */
		SLICE_CONFIG_CHANGED,
		SLICE_CONFIG_CHANGED(true),
		/**
		* Single data network arbitration. On certain RATs, only one data network is allowed at the
		* same time.
		*/
		SINGLE_DATA_NETWORK_ARBITRATION,
		SINGLE_DATA_NETWORK_ARBITRATION(true),
		/** Query from {@link TelephonyManager#isDataConnectivityPossible()}. */
		EXTERNAL_QUERY,
		EXTERNAL_QUERY(false),
		/** Tracking area code changed. */
		TAC_CHANGED,
		TAC_CHANGED(true);

		/**
		* {@code true} if the evaluation is due to environmental changes (i.e. SIM removal,
		* registration state changes, etc....
		*/
		private final boolean mIsConditionBased;

		/**
		* @return {@code true} if the evaluation is due to environmental changes (i.e. SIM removal,
		* registration state changes, etc....
		*/
		public boolean isConditionBased() {
		return mIsConditionBased;
		}

		/**
		* Constructor
		*
		* @param isConditionBased {@code true} if the evaluation is due to environmental changes
		* (i.e. SIM removal, registration state changes, etc....)
		*/
		DataEvaluationReason(boolean isConditionBased) {
		mIsConditionBased = isConditionBased;
		}
		}

		/** Disallowed reasons. There could be multiple reasons if it is not allowed. */

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -3131,7 +3131,7 @@ public class DataNetwork extends StateMachine {
		&& !mAttachedNetworkRequestList.isEmpty()) {
		TelephonyNetworkRequest networkRequest = mAttachedNetworkRequestList.get(0);
		DataProfile dataProfile = mDataNetworkController.getDataProfileManager()
		.getDataProfileForNetworkRequest(networkRequest, targetNetworkType);
		.getDataProfileForNetworkRequest(networkRequest, targetNetworkType, true);
		// Some carriers have different profiles between cellular and IWLAN. We need to
		// dynamically switch profile, but only when those profiles have same APN name.
		if (dataProfile != null && dataProfile.getApnSetting() != null

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

+34 −4

Original line number	Diff line number	Diff line
		@@ -551,6 +551,15 @@ public class DataNetworkController extends Handler {
		*/
		public void onInternetDataNetworkConnected(@NonNull List<DataProfile> dataProfiles) {}

		/**
		* Called when data network is connected.
		*
		* @param transport Transport for the connected network.
		* @param dataProfile The data profile of the connected data network.
		*/
		public void onDataNetworkConnected(@TransportType int transport,
		@NonNull DataProfile dataProfile) {}

		/** Called when internet data network is disconnected. */
		public void onInternetDataNetworkDisconnected() {}

		@@ -1426,7 +1435,7 @@ public class DataNetworkController extends Handler {
		if (networkRequest.hasCapability(NetworkCapabilities.NET_CAPABILITY_EIMS)) {
		evaluation.addDataAllowedReason(DataAllowedReason.EMERGENCY_REQUEST);
		evaluation.setCandidateDataProfile(mDataProfileManager.getDataProfileForNetworkRequest(
		networkRequest, getDataNetworkType(transport)));
		networkRequest, getDataNetworkType(transport), true));
		networkRequest.setEvaluation(evaluation);
		log(evaluation.toString());
		return evaluation;
		@@ -1575,7 +1584,10 @@ public class DataNetworkController extends Handler {
		networkType = mServiceState.getVoiceNetworkType();
		}
		DataProfile dataProfile = mDataProfileManager
		.getDataProfileForNetworkRequest(networkRequest, networkType);
		.getDataProfileForNetworkRequest(networkRequest, networkType,
		// If the evaluation is due to environmental changes, then we should ignore
		// the permanent failure reached earlier.
		reason.isConditionBased());
		if (dataProfile == null) {
		evaluation.addDataDisallowedReason(DataDisallowedReason.NO_SUITABLE_DATA_PROFILE);
		} else if (reason == DataEvaluationReason.NEW_REQUEST
		@@ -2397,9 +2409,12 @@ public class DataNetworkController extends Handler {
		+ dataSetupRetryEntry + ", allowed reason=" + allowedReason + ", service state="
		+ mServiceState);
		for (DataNetwork dataNetwork : mDataNetworkList) {
		if (dataNetwork.getDataProfile().equals(dataProfile)) {
		DataProfile currentDataProfile = dataNetwork.getDataProfile();
		if (dataProfile.equals(currentDataProfile)
		\|\| mDataProfileManager.areDataProfilesSharingApn(
		dataProfile, currentDataProfile)) {
		log("onSetupDataNetwork: Found existing data network " + dataNetwork
		+ " has the same data profile.");
		+ " using the same or a similar data profile.");
		if (dataSetupRetryEntry != null) {
		dataSetupRetryEntry.setState(DataRetryEntry.RETRY_STATE_CANCELLED);
		}
		@@ -2601,6 +2616,11 @@ public class DataNetworkController extends Handler {
		*/
		private void onDataNetworkConnected(@NonNull DataNetwork dataNetwork) {
		logl("onDataNetworkConnected: " + dataNetwork);

		mDataNetworkControllerCallbacks.forEach(callback -> callback.invokeFromExecutor(
		() -> callback.onDataNetworkConnected(dataNetwork.getTransport(),
		dataNetwork.getDataProfile())));

		mPreviousConnectedDataNetworkList.add(0, dataNetwork);
		// Preserve the connected data networks for debugging purposes.
		if (mPreviousConnectedDataNetworkList.size() > MAX_HISTORICAL_CONNECTED_DATA_NETWORKS) {
		@@ -2873,6 +2893,16 @@ public class DataNetworkController extends Handler {
		} else if (handoverFailureMode == DataCallResponse
		.HANDOVER_FAILURE_MODE_NO_FALLBACK_RETRY_SETUP_NORMAL \|\| handoverFailureMode
		== DataCallResponse.HANDOVER_FAILURE_MODE_LEGACY) {
		int preferredTransport = mAccessNetworksManager
		.getPreferredTransportByNetworkCapability(
		dataNetwork.getApnTypeNetworkCapability());
		if (dataNetwork.getTransport() == preferredTransport) {
		log("onDataNetworkHandoverFailed: Already on preferred transport "
		+ AccessNetworkConstants.transportTypeToString(preferredTransport)
		+ ". No further actions needed.");
		return;
		}

		int targetTransport = DataUtils.getTargetTransport(dataNetwork.getTransport());
		mDataRetryManager.evaluateDataSetupRetry(dataNetwork.getDataProfile(), targetTransport,
		dataNetwork.getAttachedNetworkRequestList(), cause, retryDelayMillis);

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

+31 −8

Original line number	Diff line number	Diff line
		@@ -518,7 +518,7 @@ public class DataProfileManager extends Handler {
		setPreferredDataProfile(preferredDataProfile);
		} else {
		preferredDataProfile = mAllDataProfiles.stream()
		.filter(dp -> areDataProfileSharingApn(dp, mLastInternetDataProfile))
		.filter(dp -> areDataProfilesSharingApn(dp, mLastInternetDataProfile))
		.findFirst()
		.orElse(null);
		if (preferredDataProfile != null) {
		@@ -621,14 +621,18 @@ public class DataProfileManager extends Handler {
		*
		* @param networkRequest The network request.
		* @param networkType The current data network type.
		* @param ignorePermanentFailure {@code true} to ignore {@link ApnSetting#getPermanentFailed()}.
		* This should be set to true for condition-based retry/setup.
		* @return The data profile. {@code null} if can't find any satisfiable data profile.
		*/
		public @Nullable DataProfile getDataProfileForNetworkRequest(
		@NonNull TelephonyNetworkRequest networkRequest, @NetworkType int networkType) {
		@NonNull TelephonyNetworkRequest networkRequest, @NetworkType int networkType,
		boolean ignorePermanentFailure) {
		ApnSetting apnSetting = null;
		if (networkRequest.hasAttribute(TelephonyNetworkRequest
		.CAPABILITY_ATTRIBUTE_APN_SETTING)) {
		apnSetting = getApnSettingForNetworkRequest(networkRequest, networkType);
		apnSetting = getApnSettingForNetworkRequest(networkRequest, networkType,
		ignorePermanentFailure);
		}

		TrafficDescriptor.Builder trafficDescriptorBuilder = new TrafficDescriptor.Builder();
		@@ -687,10 +691,13 @@ public class DataProfileManager extends Handler {
		*
		* @param networkRequest The network request.
		* @param networkType The current data network type.
		* @param ignorePermanentFailure {@code true} to ignore {@link ApnSetting#getPermanentFailed()}.
		* This should be set to true for condition-based retry/setup.
		* @return The APN setting. {@code null} if can't find any satisfiable data profile.
		*/
		private @Nullable ApnSetting getApnSettingForNetworkRequest(
		@NonNull TelephonyNetworkRequest networkRequest, @NetworkType int networkType) {
		@NonNull TelephonyNetworkRequest networkRequest, @NetworkType int networkType,
		boolean ignorePermanentFailure) {
		if (!networkRequest.hasAttribute(
		TelephonyNetworkRequest.CAPABILITY_ATTRIBUTE_APN_SETTING)) {
		loge("Network request does not have APN setting attribute.");
		@@ -733,6 +740,7 @@ public class DataProfileManager extends Handler {
		&& (dp.getApnSetting().getApnSetId()
		== Telephony.Carriers.MATCH_ALL_APN_SET_ID
		\|\| dp.getApnSetting().getApnSetId() == mPreferredDataProfileSetId))
		.filter(dp -> ignorePermanentFailure \|\| !dp.getApnSetting().getPermanentFailed())
		.collect(Collectors.toList());
		if (dataProfiles.size() == 0) {
		log("Can't find any data profile has APN set id matched. mPreferredDataProfileSetId="
		@@ -740,6 +748,15 @@ public class DataProfileManager extends Handler {
		return null;
		}

		// Check if data profiles are permanently failed.
		dataProfiles = dataProfiles.stream()
		.filter(dp -> ignorePermanentFailure \|\| !dp.getApnSetting().getPermanentFailed())
		.collect(Collectors.toList());
		if (dataProfiles.size() == 0) {
		log("The suitable data profiles are all in permanent failed state.");
		return null;
		}

		return dataProfiles.get(0).getApnSetting();
		}

		@@ -751,7 +768,7 @@ public class DataProfileManager extends Handler {
		* @return {@code true} if the data profile is essentially the preferred data profile.
		*/
		public boolean isDataProfilePreferred(@NonNull DataProfile dataProfile) {
		return areDataProfileSharingApn(dataProfile, mPreferredDataProfile);
		return areDataProfilesSharingApn(dataProfile, mPreferredDataProfile);
		}

		/**
		@@ -772,7 +789,7 @@ public class DataProfileManager extends Handler {
		new NetworkRequest.Builder()
		.addCapability(NetworkCapabilities.NET_CAPABILITY_DUN)
		.build(), mPhone);
		return getDataProfileForNetworkRequest(networkRequest, networkType) != null;
		return getDataProfileForNetworkRequest(networkRequest, networkType, true) != null;
		}

		/**
		@@ -989,14 +1006,14 @@ public class DataProfileManager extends Handler {
		&& (dp.getApnSetting().getApnSetId()
		== Telephony.Carriers.MATCH_ALL_APN_SET_ID
		\|\| dp.getApnSetting().getApnSetId() == mPreferredDataProfileSetId))
		.anyMatch(dp -> areDataProfileSharingApn(dataProfile, dp));
		.anyMatch(dp -> areDataProfilesSharingApn(dataProfile, dp));
		}

		/**
		* @return {@code true} if both data profiles' APN setting are non-null and essentially the same
		* (non-essential elements include e.g.APN Id).
		*/
		private boolean areDataProfileSharingApn(@Nullable DataProfile a, @Nullable DataProfile b) {
		public boolean areDataProfilesSharingApn(@Nullable DataProfile a, @Nullable DataProfile b) {
		return a != null
		&& b != null
		&& a.getApnSetting() != null
		@@ -1094,6 +1111,12 @@ public class DataProfileManager extends Handler {
		pw.println("Initial attach data profile=" + mInitialAttachDataProfile);
		pw.println("isTetheringDataProfileExisting=" + isTetheringDataProfileExisting(
		TelephonyManager.NETWORK_TYPE_LTE));
		pw.println("Permanent failed profiles=");
		pw.increaseIndent();
		mAllDataProfiles.stream()
		.filter(dp -> dp.getApnSetting() != null && dp.getApnSetting().getPermanentFailed())
		.forEach(pw::println);
		pw.decreaseIndent();

		pw.println("Local logs:");
		pw.increaseIndent();

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

+170 −88

File changed.

Preview size limit exceeded, changes collapsed.