Merge "Added APN to string method" am: 3bedd0a674 (94107f2f) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/AccessNetworkConstants.java

+24 −2

Original line number	Diff line number	Diff line
		@@ -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 −0

Original line number	Diff line number	Diff line
		@@ -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.