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

Supported UNKNOWN in IWLAN handover rule

Browse Source 
Extended handover rule to support the scenario that
handover should be blocked when source network goes
out of service.

Test: Basic testing + Wifi calling handover test + atest DataNetworkControllerTest
Bug: 234095834
Change-Id: I68c23f970af2a554ab438f630363be4591664cbb
This commit is contained in:
Sarah Chin
2022-06-01 17:08:53 -07:00
committed by Jack Yu
parent a825b67ac8
commit d9ac485b1f
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 */
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);
}
}
}

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