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

Commit 4559edad authored by Jack Yu's avatar Jack Yu Committed by Android (Google) Code Review
Browse files

Merge "Fixed the missing capabilities in the retry config" into main

parents 5f8a2979 87d6050c

src/java/com/android/internal/telephony/data/DataUtils.java

+2 −1
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ public class DataUtils { 
            case "RCS":

                return NetworkCapabilities.NET_CAPABILITY_RCS;

            default:

                loge("Illegal network capability: " + capabilityString);

                return -1;

        }

    }
@@ -108,7 +109,7 @@ public class DataUtils { 
    public static @NetCapability Set<Integer> getNetworkCapabilitiesFromString(

            @NonNull String capabilitiesString) {

        // e.g. "IMS|" is not allowed

        if (!capabilitiesString.matches("(\\s*[a-zA-Z]+\\s*)(\\|\\s*[a-zA-Z]+\\s*)*")) {

        if (!capabilitiesString.matches("(\\s*[a-zA-Z_]+\\s*)(\\|\\s*[a-zA-Z_]+\\s*)*")) {

            return Collections.singleton(-1);

        }

        return Arrays.stream(capabilitiesString.split("\\s*\\|\\s*"))

tests/telephonytests/src/com/android/internal/telephony/data/DataNetworkControllerTest.java

+4 −3
Original line number Diff line number Diff line
@@ -775,9 +775,10 @@ public class DataNetworkControllerTest extends TelephonyTest { 
                        "capabilities=eims, retry_interval=1000, maximum_retries=20",

                        "permanent_fail_causes=8|27|28|29|30|32|33|35|50|51|111|-5|-6|65537|65538|"

                                + "-3|65543|65547|2252|2253|2254, retry_interval=2500",

                        "capabilities=mms|supl|cbs, retry_interval=2000",

                        "capabilities=internet|enterprise|dun|ims|fota, retry_interval=2500|3000|"

                                + "5000|10000|15000|20000|40000|60000|120000|240000|"

                        "capabilities=mms|supl|cbs|rcs, retry_interval=2000",

                        "capabilities=internet|enterprise|dun|ims|fota|xcap|mcx|"

                                + "prioritize_bandwidth|prioritize_latency, retry_interval="

                                + "2500|3000|5000|10000|15000|20000|40000|60000|120000|240000|"

                                + "600000|1200000|1800000, maximum_retries=20"

                });

        mCarrierConfig.putStringArray(