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

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

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

Change-Id: If3fd168078210a902f40f568336c7357c28db4b3
This commit is contained in:
Jack Yu
2021-07-13 17:21:38 +00:00
committed by Automerger Merge Worker
parent d773fb8f40 ef140360c3
commit c57a926bbe
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
telephony/java/android/telephony/data/ApnSetting.java
View File

@@ -1581,16 +1581,6 @@ public class ApnSetting implements Parcelable {
return apnTypeString == null ? "" : apnTypeString; 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. * Converts the string representation of an APN type to its integer representation.
* *