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

Merge "Added APN to string method" am: 3bedd0a674

Browse Source 
am: 56ce3a6f41

Change-Id: I61247c8f7e8f5069b28167b9e940782f80edfaee
This commit is contained in:
Jack Yu
2018-11-06 10:48:00 -08:00
committed by android-build-merger
parent e2e5daf291 56ce3a6f41
commit 94107f2fea
2 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);
}
}
}
/**

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

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