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"

Browse Source 
* changes:
  [Telephony] Clean up: remove getApnTypeStringInternal
  Disallow data when QNS switched the preference
This commit is contained in:
Jack Yu
2021-07-13 17:04:23 +00:00
committed by Gerrit Code Review
parent 1ce000ff84 7e0ae7528d
commit ef140360c3
2 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
telephony/java/android/telephony/AccessNetworkConstants.java
View File

@@ -62,6 +62,7 @@ public final class AccessNetworkConstants {
switch (transportType) { switch (transportType) {
case TRANSPORT_TYPE_WWAN: return "WWAN"; case TRANSPORT_TYPE_WWAN: return "WWAN";
case TRANSPORT_TYPE_WLAN: return "WLAN"; case TRANSPORT_TYPE_WLAN: return "WLAN";
case TRANSPORT_TYPE_INVALID: return "INVALID";
default: return Integer.toString(transportType); default: return Integer.toString(transportType);
} }
} }

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.
* *