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

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

Browse Source 
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>
This commit is contained in:
Jack Yu
2022-08-03 23:43:37 +00:00
committed by Automerger Merge Worker
parent cd0bb94e98 d59d93d019
commit 37d43b9df8
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -115,15 +115,15 @@ 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 "GERAN" : return GERAN; case "UNKNOWN": return UNKNOWN;
case "UTRAN" : return UTRAN; case "GERAN": return GERAN;
case "EUTRAN" : return EUTRAN; case "UTRAN": return UTRAN;
case "CDMA2000" : return CDMA2000; case "EUTRAN": return EUTRAN;
case "IWLAN" : return IWLAN; case "CDMA2000": return CDMA2000;
case "NGRAN" : return NGRAN; case "IWLAN": return IWLAN;
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 -->