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

Commit c57a926b authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Merge changes from topics "getApnTypeString", "qns_switched_pref" am: ef140360 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1763946

Change-Id: If3fd168078210a902f40f568336c7357c28db4b3
parents d773fb8f ef140360

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.

     *