Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Supported UNKNOWN in IWLAN handover rule" am: 1a90569c95 am: 5a1166355a

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2195237

Change-Id: I22f06f05a963a8a7bcaf81f982c33920aa0e9f27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-08-25 22:18:41 +00:00
committed by Automerger Merge Worker
parent d682efe214 5a1166355a
commit bf5f0779fa
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
telephony/java/android/telephony/AccessNetworkConstants.java
View File

@@ -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;
} }
} }
} }

7
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -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 -->