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

resolved conflicts for merge of e139167c to master

Browse Source 
Change-Id: Ic4d8aae7dd457457d9cc8ba081b273e425729f86
This commit is contained in:
Robert Greenwalt
2011-06-08 10:01:06 -07:00
parent 3932aa7ff8 e139167c91
commit 8a02401129
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -426,8 +426,7 @@ public class TelephonyManager {
public static final int NETWORK_TYPE_LTE = 13;
/** Current network is eHRPD */
public static final int NETWORK_TYPE_EHRPD = 14;
/** Current network is HSPA+
* @hide */
/** Current network is HSPA+ */
public static final int NETWORK_TYPE_HSPAP = 15;
/**
@@ -450,6 +449,7 @@ public class TelephonyManager {
* @see #NETWORK_TYPE_IDEN
* @see #NETWORK_TYPE_LTE
* @see #NETWORK_TYPE_EHRPD
* @see #NETWORK_TYPE_HSPAP
*/
public int getNetworkType() {
try{
@@ -551,6 +551,8 @@ public class TelephonyManager {
return "CDMA - eHRPD";
case NETWORK_TYPE_IDEN:
return "iDEN";
case NETWORK_TYPE_HSPAP:
return "HSPA+";
default:
return "UNKNOWN";
}