Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd9131dc authored by Kenneth Westin's avatar Kenneth Westin Committed by Johan Redestig
Browse files

Avoid crash when switching to 2G/3G network. 

Adding test that active APN array is not empty.

Change-Id: I16246aa45c991a9396ef03d9bb083d97c3ca2e1a
parent 7fceefa7

src/com/android/settings/RadioInfo.java

+12 −9
Original line number Diff line number Diff line
@@ -774,16 +774,19 @@ public class RadioInfo extends Activity { 
                    sb.append("\n    to ")

                      .append(pdp.getApn().toString());

                }

                String[] activeApnTypes = phone.getActiveApnTypes();

                if (activeApnTypes.length > 0) {

                    sb.append("\ninterface: ")

                  .append(phone.getInterfaceName(phone.getActiveApnTypes()[0]))

                      .append(phone.getInterfaceName(activeApnTypes[0]))

                      .append("\naddress: ")

                  .append(phone.getIpAddress(phone.getActiveApnTypes()[0]))

                      .append(phone.getIpAddress(activeApnTypes[0]))

                      .append("\ngateway: ")

                  .append(phone.getGateway(phone.getActiveApnTypes()[0]));

                String[] dns = phone.getDnsServers(phone.getActiveApnTypes()[0]);

                      .append(phone.getGateway(activeApnTypes[0]));

                    String[] dns = phone.getDnsServers(activeApnTypes[0]);

                    if (dns != null) {

                        sb.append("\ndns: ").append(dns[0]).append(", ").append(dns[1]);

                    }

                }

            } else if (dc.isInactive()) {

                sb.append("    disconnected with last try at ")

                  .append(DateUtils.timeString(dc.getLastFailTime()))