PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 21838 into eclair

Browse Source 
* changes:
  Fix RadioInfo for CDMA.
This commit is contained in:
Android (Google) Code Review
2009-08-19 12:12:49 -07:00
parent 2c9b21f048 87fa11b90e
commit f78227df41
1 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/com/android/settings/RadioInfo.java
View File

@@ -51,6 +51,7 @@ import android.widget.Spinner;
import android.widget.TextView; import android.widget.TextView;
import android.widget.EditText; import android.widget.EditText;
import com.android.internal.telephony.DataConnection;
import com.android.internal.telephony.Phone; import com.android.internal.telephony.Phone;
import com.android.internal.telephony.PhoneFactory; import com.android.internal.telephony.PhoneFactory;
import com.android.internal.telephony.PhoneStateIntentReceiver; import com.android.internal.telephony.PhoneStateIntentReceiver;
@@ -200,7 +201,7 @@ public class RadioInfo extends Activity {
int type = ((int[])ar.result)[0]; int type = ((int[])ar.result)[0];
preferredNetworkType.setSelection(type, true); preferredNetworkType.setSelection(type, true);
} else { } else {
preferredNetworkType.setSelection(3, true); preferredNetworkType.setSelection(8, true);
} }
break; break;
case EVENT_SET_PREFERRED_TYPE_DONE: case EVENT_SET_PREFERRED_TYPE_DONE:
@@ -916,20 +917,24 @@ public class RadioInfo extends Activity {
private final void updatePdpList() { private final void updatePdpList() {
StringBuilder sb = new StringBuilder("========DATA=======\n"); StringBuilder sb = new StringBuilder("========DATA=======\n");
List<PdpConnection> pdps = phone.getCurrentPdpList(); List<DataConnection> dcs = phone.getCurrentDataConnectionList();
for (PdpConnection pdp : pdps) { for (DataConnection dc : dcs) {
sb.append(" State: ").append(pdp.getState().toString()).append("\n"); sb.append(" State: ").append(dc.getState().toString()).append("\n");
if (pdp.getState().isActive()) { if (dc.getState().isActive()) {
long timeElapsed = long timeElapsed =
(System.currentTimeMillis() - pdp.getConnectionTime())/1000; (System.currentTimeMillis() - dc.getConnectionTime())/1000;
sb.append(" connected at ") sb.append(" connected at ")
.append(DateUtils.timeString(pdp.getConnectionTime())) .append(DateUtils.timeString(dc.getConnectionTime()))
.append(" and elapsed ") .append(" and elapsed ")
.append(DateUtils.formatElapsedTime(timeElapsed)) .append(DateUtils.formatElapsedTime(timeElapsed));
.append("\n to ")
.append(pdp.getApn().toString()) if (dc instanceof PdpConnection) {
.append("\ninterface: ") PdpConnection pdp = (PdpConnection)dc;
sb.append("\n to ")
.append(pdp.getApn().toString());
}
sb.append("\ninterface: ")
.append(phone.getInterfaceName(phone.getActiveApnTypes()[0])) .append(phone.getInterfaceName(phone.getActiveApnTypes()[0]))
.append("\naddress: ") .append("\naddress: ")
.append(phone.getIpAddress(phone.getActiveApnTypes()[0])) .append(phone.getIpAddress(phone.getActiveApnTypes()[0]))
@@ -939,14 +944,19 @@ public class RadioInfo extends Activity {
if (dns != null) { if (dns != null) {
sb.append("\ndns: ").append(dns[0]).append(", ").append(dns[1]); sb.append("\ndns: ").append(dns[0]).append(", ").append(dns[1]);
} }
} else if (pdp.getState().isInactive()) { } else if (dc.getState().isInactive()) {
sb.append(" disconnected with last try at ") sb.append(" disconnected with last try at ")
.append(DateUtils.timeString(pdp.getLastFailTime())) .append(DateUtils.timeString(dc.getLastFailTime()))
.append("\n fail because ") .append("\n fail because ")
.append(pdp.getLastFailCause().toString()); .append(dc.getLastFailCause().toString());
} else { } else {
sb.append(" is connecting to ") if (dc instanceof PdpConnection) {
.append(pdp.getApn().toString()); PdpConnection pdp = (PdpConnection)dc;
sb.append(" is connecting to ")
.append(pdp.getApn().toString());
} else {
sb.append(" is connecting");
}
} }
sb.append("\n==================="); sb.append("\n===================");
} }
@@ -1148,5 +1158,13 @@ public class RadioInfo extends Activity {
}; };
private String[] mPreferredNetworkLabels = { private String[] mPreferredNetworkLabels = {
"WCDMA preferred", "GSM only", "WCDMA only", "Unknown"}; "WCDMA preferred",
"GSM only",
"WCDMA only",
"GSM auto (PRL)",
"CDMA auto (PRL)",
"CDMA only",
"EvDo only",
"GSM/CDMA auto (PRL)",
"Unknown"};
} }