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

am bc20d67f: Merge "Avoid crash when switching to 2G/3G network."

Browse Source 
* commit 'bc20d67fedd453eec9dcb127cf9df909a192baf5':
  Avoid crash when switching to 2G/3G network.
This commit is contained in:
Conley Owens
2011-04-27 09:55:23 -07:00
committed by Android Git Automerger
parent f927cccd79 bc20d67fed
commit 47cd8a47f7
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -774,16 +774,19 @@ public class RadioInfo extends Activity {
sb.append("\n to ") sb.append("\n to ")
.append(pdp.getApn().toString()); .append(pdp.getApn().toString());
} }
String[] activeApnTypes = phone.getActiveApnTypes();
if (activeApnTypes.length > 0) {
sb.append("\ninterface: ") sb.append("\ninterface: ")
.append(phone.getInterfaceName(phone.getActiveApnTypes()[0])) .append(phone.getInterfaceName(activeApnTypes[0]))
.append("\naddress: ") .append("\naddress: ")
.append(phone.getIpAddress(phone.getActiveApnTypes()[0])) .append(phone.getIpAddress(activeApnTypes[0]))
.append("\ngateway: ") .append("\ngateway: ")
.append(phone.getGateway(phone.getActiveApnTypes()[0])); .append(phone.getGateway(activeApnTypes[0]));
String[] dns = phone.getDnsServers(phone.getActiveApnTypes()[0]); String[] dns = phone.getDnsServers(activeApnTypes[0]);
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 (dc.isInactive()) { } else if (dc.isInactive()) {
sb.append(" disconnected with last try at ") sb.append(" disconnected with last try at ")
.append(DateUtils.timeString(dc.getLastFailTime())) .append(DateUtils.timeString(dc.getLastFailTime()))