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

Commit ef140360 authored by Jack Yu's avatar Jack Yu Committed by Gerrit Code Review
Browse files

Merge changes from topics "getApnTypeString", "qns_switched_pref" 

* changes:
  [Telephony] Clean up: remove getApnTypeStringInternal
  Disallow data when QNS switched the preference
parents 1ce000ff 7e0ae752

telephony/java/android/telephony/AccessNetworkConstants.java

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ public final class AccessNetworkConstants { 
        switch (transportType) {

            case TRANSPORT_TYPE_WWAN: return "WWAN";

            case TRANSPORT_TYPE_WLAN: return "WLAN";

            case TRANSPORT_TYPE_INVALID: return "INVALID";

            default: return Integer.toString(transportType);

        }

    }

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

+0 −10
Original line number Diff line number Diff line
@@ -1581,16 +1581,6 @@ public class ApnSetting implements Parcelable { 
        return apnTypeString == null ? "" : apnTypeString;

    }



    /**

     * Same as {@link #getApnTypeString(int)}, but returns "Unknown" instead of an empty string

     * when provided with an invalid int for compatibility purposes.

     * @hide

     */

    public static @NonNull String getApnTypeStringInternal(@ApnType int apnType) {

        String result = getApnTypeString(apnType);

        return TextUtils.isEmpty(result) ? "Unknown" : result;

    }



    /**

     * Converts the string representation of an APN type to its integer representation.

     *