diff options
| author | 2022-08-04 00:11:03 +0000 | |
|---|---|---|
| committer | 2022-08-04 00:11:03 +0000 | |
| commit | 02199da09969cf603022c62329de1908ee7e3cb3 (patch) | |
| tree | 6717a682f84aa8e62cb9765a9267e78c6b7fde82 | |
| parent | d9131a60b50706b8123c7de32de5e73211d97eff (diff) | |
| parent | 37d43b9df83143aa76de41d67758b69ce47a7966 (diff) | |
Merge "Supported UNKNOWN in IWLAN handover rule" into tm-d1-dev am: 2c6ac09bda am: d59d93d019 am: 37d43b9df8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19509981
Change-Id: I4e829be4d1331d419816ce2b96759cc28eb3d7b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | telephony/java/android/telephony/AccessNetworkConstants.java | 16 | ||||
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 7 |
2 files changed, 15 insertions, 8 deletions
diff --git a/telephony/java/android/telephony/AccessNetworkConstants.java b/telephony/java/android/telephony/AccessNetworkConstants.java index 4469ffc14447..7eec86a40c13 100644 --- a/telephony/java/android/telephony/AccessNetworkConstants.java +++ b/telephony/java/android/telephony/AccessNetworkConstants.java @@ -115,15 +115,15 @@ public final class AccessNetworkConstants { /** @hide */ public static @RadioAccessNetworkType int fromString(@NonNull String str) { switch (str.toUpperCase()) { - case "GERAN" : return GERAN; - case "UTRAN" : return UTRAN; - case "EUTRAN" : return EUTRAN; - case "CDMA2000" : return CDMA2000; - case "IWLAN" : return IWLAN; - case "NGRAN" : return NGRAN; + case "UNKNOWN": return UNKNOWN; + case "GERAN": return GERAN; + case "UTRAN": return UTRAN; + case "EUTRAN": return EUTRAN; + case "CDMA2000": return CDMA2000; + case "IWLAN": return IWLAN; + case "NGRAN": return NGRAN; default: - Rlog.e(TAG, "Invalid access network type " + str); - return UNKNOWN; + throw new IllegalArgumentException("Invalid access network type " + str); } } } diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 6deb6f898484..4d18dfe6a62c 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -8596,6 +8596,13 @@ public class CarrierConfigManager { * IWLAN handover rules that determine whether handover is allowed or disallowed between * 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. * <string-array name="iwlan_handover_rules" num="5"> * <!-- Handover from IWLAN to 2G/3G is not allowed --> |