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

Commit 37d43b9d authored Aug 03, 2022 by Jack Yu Committed by Automerger Merge Worker Aug 03, 2022

Merge "Supported UNKNOWN in IWLAN handover rule" into tm-d1-dev am: 2c6ac09b am: d59d93d0

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19509981

Change-Id: I4e75b0074ba69b2c882ecd05ff734237d4512c0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents cd0bb94e d59d93d0

telephony/java/android/telephony/AccessNetworkConstants.java

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -115,6 +115,7 @@ public final class AccessNetworkConstants {
	/** @hide */		/** @hide */
	public static @RadioAccessNetworkType int fromString(@NonNull String str) {		public static @RadioAccessNetworkType int fromString(@NonNull String str) {
	switch (str.toUpperCase()) {		switch (str.toUpperCase()) {
			case "UNKNOWN": return UNKNOWN;
	case "GERAN": return GERAN;		case "GERAN": return GERAN;
	case "UTRAN": return UTRAN;		case "UTRAN": return UTRAN;
	case "EUTRAN": return EUTRAN;		case "EUTRAN": return EUTRAN;
	@@ -122,8 +123,7 @@ public final class AccessNetworkConstants {
	case "IWLAN": return IWLAN;		case "IWLAN": return IWLAN;
	case "NGRAN": return NGRAN;		case "NGRAN": return NGRAN;
	default:		default:
	Rlog.e(TAG, "Invalid access network type " + str);		throw new IllegalArgumentException("Invalid access network type " + str);
	return UNKNOWN;
	}		}
	}		}
	}		}

telephony/java/android/telephony/CarrierConfigManager.java

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -8550,6 +8550,13 @@ public class CarrierConfigManager {
	* IWLAN handover rules that determine whether handover is allowed or disallowed between		* IWLAN handover rules that determine whether handover is allowed or disallowed between
	* cellular and IWLAN.		* cellular and IWLAN.
	*		*
			* Rule syntax: "source=[GERAN\|UTRAN\|EUTRAN\|NGRAN\|IWLAN\|UNKNOWN], target=[GERAN\|UTRAN\|EUTRAN
			* \|NGRAN\|IWLAN], type=[allowed\|disallowed], roaming=[true\|false], capabilities=[INTERNET\|MMS
			* \|FOTA\|IMS\|CBS\|SUPL\|EIMS\|XCAP\|DUN]"
			*
			* Note that UNKNOWN can be only specified in the source access network and can be only used
			* in the disallowed rule.
			*
	* The handover rules will be matched in the order. Here are some sample rules.		* The handover rules will be matched in the order. Here are some sample rules.
	* <string-array name="iwlan_handover_rules" num="5">		* <string-array name="iwlan_handover_rules" num="5">
	* <!-- Handover from IWLAN to 2G/3G is not allowed -->		* <!-- Handover from IWLAN to 2G/3G is not allowed -->