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

merge from open-source master

Browse Source 
Change-Id: If6730b50627b2231bd345e594d8d30a37557849e
This commit is contained in:
The Android Open Source Project
2010-05-12 14:53:25 -07:00
parent ccfd99b1e2 0a5174a6e9
commit 4adacd23d4
7 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
api/current.xml
View File

@@ -142238,6 +142238,17 @@
visibility="public"
>
</field>
<field name="NETWORK_TYPE_EVDO_B"
type="int"
transient="false"
volatile="false"
value="12"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="NETWORK_TYPE_GPRS"
type="int"
transient="false"

3
core/java/android/net/MobileDataStateTracker.java
View File

@@ -310,6 +310,9 @@ public class MobileDataStateTracker extends NetworkStateTracker {
case TelephonyManager.NETWORK_TYPE_EVDO_A:
networkTypeStr = "evdo";
break;
case TelephonyManager.NETWORK_TYPE_EVDO_B:
networkTypeStr = "evdo";
break;
}
return "net.tcp.buffersize." + networkTypeStr;
}

6
services/java/com/android/server/status/StatusBarPolicy.java
View File

@@ -954,7 +954,9 @@ public class StatusBarPolicy {
&& ((mServiceState.getRadioTechnology()
== ServiceState.RADIO_TECHNOLOGY_EVDO_0)
|| (mServiceState.getRadioTechnology()
== ServiceState.RADIO_TECHNOLOGY_EVDO_A)));
== ServiceState.RADIO_TECHNOLOGY_EVDO_A)
|| (mServiceState.getRadioTechnology()
== ServiceState.RADIO_TECHNOLOGY_EVDO_B)));
}
private boolean hasService() {
@@ -1070,7 +1072,6 @@ public class StatusBarPolicy {
}
private final void updateDataNetType(int net) {
switch (net) {
case TelephonyManager.NETWORK_TYPE_EDGE:
mDataIconList = sDataNetType_e;
@@ -1096,6 +1097,7 @@ public class StatusBarPolicy {
break;
case TelephonyManager.NETWORK_TYPE_EVDO_0: //fall through
case TelephonyManager.NETWORK_TYPE_EVDO_A:
case TelephonyManager.NETWORK_TYPE_EVDO_B:
mDataIconList = sDataNetType_3g;
break;
default:

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

@@ -89,6 +89,8 @@ public class ServiceState implements Parcelable {
public static final int RADIO_TECHNOLOGY_HSUPA = 10;
/** @hide */
public static final int RADIO_TECHNOLOGY_HSPA = 11;
/** @hide */
public static final int RADIO_TECHNOLOGY_EVDO_B = 12;
/**
* Available registration states for GSM, UMTS and CDMA.
@@ -379,7 +381,6 @@ public class ServiceState implements Parcelable {
@Override
public String toString() {
String radioTechnology = new String("Error in radioTechnology");
switch(this.mRadioTechnology) {
case 0:
radioTechnology = "Unknown";
@@ -417,6 +418,9 @@ public class ServiceState implements Parcelable {
case 11:
radioTechnology = "HSPA";
break;
case 12:
radioTechnology = "EvDo rev. B";
break;
default:
Log.w(LOG_TAG, "mRadioTechnology variable out of range.");
break;

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

@@ -391,6 +391,9 @@ public class TelephonyManager {
public static final int NETWORK_TYPE_HSPA = 10;
/** Current network is iDen */
public static final int NETWORK_TYPE_IDEN = 11;
/** Current network is EVDO revision B*/
public static final int NETWORK_TYPE_EVDO_B = 12;
/**
* Returns a constant indicating the radio technology (network type)
@@ -407,6 +410,7 @@ public class TelephonyManager {
* @see #NETWORK_TYPE_CDMA
* @see #NETWORK_TYPE_EVDO_0
* @see #NETWORK_TYPE_EVDO_A
* @see #NETWORK_TYPE_EVDO_B
* @see #NETWORK_TYPE_1xRTT
*/
public int getNetworkType() {
@@ -454,6 +458,8 @@ public class TelephonyManager {
return "CDMA - EvDo rev. 0";
case NETWORK_TYPE_EVDO_A:
return "CDMA - EvDo rev. A";
case NETWORK_TYPE_EVDO_B:
return "CDMA - EvDo rev. B";
case NETWORK_TYPE_1xRTT:
return "CDMA - 1xRTT";
default:

1
telephony/java/com/android/internal/telephony/ServiceStateTracker.java
View File

@@ -44,6 +44,7 @@ public abstract class ServiceStateTracker extends Handler {
protected static final int DATA_ACCESS_HSDPA = 9;
protected static final int DATA_ACCESS_HSUPA = 10;
protected static final int DATA_ACCESS_HSPA = 11;
protected static final int DATA_ACCESS_CDMA_EvDo_B = 12;
protected CommandsInterface cm;

4
telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
View File

@@ -945,6 +945,9 @@ final class CdmaServiceStateTracker extends ServiceStateTracker {
case DATA_ACCESS_CDMA_EvDo_A:
ret = "CDMA - EvDo rev. A";
break;
case DATA_ACCESS_CDMA_EvDo_B:
ret = "CDMA - EvDo rev. B";
break;
default:
if (DBG) {
Log.e(LOG_TAG, "Wrong network. Can not return a string.");
@@ -1237,6 +1240,7 @@ final class CdmaServiceStateTracker extends ServiceStateTracker {
case 6: // RADIO_TECHNOLOGY_1xRTT
case 7: // RADIO_TECHNOLOGY_EVDO_0
case 8: // RADIO_TECHNOLOGY_EVDO_A
case 12: // RADIO_TECHNOLOGY_EVDO_B
retVal = ServiceState.STATE_IN_SERVICE;
break;
default: