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

Commit 24d9490c authored by Jack Yu's avatar Jack Yu
Browse files

Added APN to string method 

There were some limitation of the existing method
ApnSetting.getApnTypesBitmaskFromString, which prints
hipri+default when input is default APN type.

Also added access network type and transport type to string
method.

Test: Telephony sanity tests
Bug: 73659459
Change-Id: I5a24ac4b284c9237f84c8b1a6961569c4f0a747a
parent 3ef1990e

telephony/java/android/telephony/AccessNetworkConstants.java

+24 −2
Original line number Diff line number Diff line
@@ -32,7 +32,20 @@ public final class AccessNetworkConstants { 
        public static final int IWLAN = 5;



        /** @hide */

        private AccessNetworkType() {};

        private AccessNetworkType() {}



        /** @hide */

        public static String toString(int type) {

            switch (type) {

                case UNKNOWN: return "UNKNOWN";

                case GERAN: return "GERAN";

                case UTRAN: return "UTRAN";

                case EUTRAN: return "EUTRAN";

                case CDMA2000: return "CDMA2000";

                case IWLAN: return "IWLAN";

                default: return Integer.toString(type);

            }

        }

    }



    /**
@@ -47,7 +60,16 @@ public final class AccessNetworkConstants { 
        public static final int WLAN = 2;



        /** @hide */

        private TransportType() {};

        private TransportType() {}



        /** @hide */

        public static String toString(int type) {

            switch (type) {

                case WWAN: return "WWAN";

                case WLAN: return "WLAN";

                default: return Integer.toString(type);

            }

        }

    }



    /**

telephony/java/android/telephony/data/ApnSetting.java

+10 −0
Original line number Diff line number Diff line
@@ -1183,6 +1183,16 @@ public class ApnSetting implements Parcelable { 
        return TextUtils.join(",", types);

    }



    /**

     * @param apnType APN type

     * @return APN type in string format

     * @hide

     */

    public static String getApnTypeString(int apnType) {

        String apnTypeString = APN_TYPE_INT_MAP.get(apnType);

        return apnTypeString == null ? "Unknown" : apnTypeString;

    }



    /**

     * @param types comma delimited list of APN types.

     * @return bitmask of APN types.