am 43799457: am 74ec5808: am 7e411f74: Merge "Add support for NETWORK_TYPE_GSM" (51d427ca) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/ServiceState.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -797,6 +797,8 @@ public class ServiceState implements Parcelable {
		return TelephonyManager.NETWORK_TYPE_LTE;
		case ServiceState.RIL_RADIO_TECHNOLOGY_HSPAP:
		return TelephonyManager.NETWORK_TYPE_HSPAP;
		case ServiceState.RIL_RADIO_TECHNOLOGY_GSM:
		return TelephonyManager.NETWORK_TYPE_GSM;
		default:
		return TelephonyManager.NETWORK_TYPE_UNKNOWN;
		}

+5 −0

Original line number	Diff line number	Diff line
		@@ -911,6 +911,8 @@ public class TelephonyManager {
		public static final int NETWORK_TYPE_EHRPD = 14;
		/** Current network is HSPA+ */
		public static final int NETWORK_TYPE_HSPAP = 15;
		/** Current network is GSM {@hide} */
		public static final int NETWORK_TYPE_GSM = 16;

		/**
		* @return the NETWORK_TYPE_xxxx for current data connection.
		@@ -1002,6 +1004,7 @@ public class TelephonyManager {
		public static int getNetworkClass(int networkType) {
		switch (networkType) {
		case NETWORK_TYPE_GPRS:
		case NETWORK_TYPE_GSM:
		case NETWORK_TYPE_EDGE:
		case NETWORK_TYPE_CDMA:
		case NETWORK_TYPE_1xRTT:
		@@ -1068,6 +1071,8 @@ public class TelephonyManager {
		return "iDEN";
		case NETWORK_TYPE_HSPAP:
		return "HSPA+";
		case NETWORK_TYPE_GSM:
		return "GSM";
		default:
		return "UNKNOWN";
		}