Merge "Fix force close in WiFi API test code" into main

src/com/android/settings/wifi/WifiAPITest.java

@@ -164,7 +164,13 @@ public class WifiAPITest extends SettingsPreferenceFragment implements
             alert.setPositiveButton("Ok", new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface dialog, int whichButton) {
                     Editable value = input.getText();
+                    try {
                         netid = Integer.parseInt(value.toString());
+                    } catch (NumberFormatException e) {
+                        // Invalid netid
+                        e.printStackTrace();
+                        return;
+                    }
                     mWifiManager.enableNetwork(netid, false);
                 }
             });