From 6bafe1b1c03dc5fcea9ca260e9a162bdd2ec1102 Mon Sep 17 00:00:00 2001 From: hoffc Date: Tue, 11 Mar 2025 12:28:02 +0800 Subject: [PATCH] Fix force close in WiFi API test code Enable WiFi network with empty net id, force close will occur. Add number format exception catch when parsing net id. Bug: 402260924 Change-Id: I540fdeddc7072e7a9414ac7f9d7aca348d06cd30 --- src/com/android/settings/wifi/WifiAPITest.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/wifi/WifiAPITest.java b/src/com/android/settings/wifi/WifiAPITest.java index 89538751685..8567f4173d3 100644 --- a/src/com/android/settings/wifi/WifiAPITest.java +++ b/src/com/android/settings/wifi/WifiAPITest.java @@ -162,12 +162,18 @@ public class WifiAPITest extends SettingsPreferenceFragment implements final EditText input = new EditText(getPrefContext()); alert.setView(input); alert.setPositiveButton("Ok", new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int whichButton) { + public void onClick(DialogInterface dialog, int whichButton) { Editable value = input.getText(); - netid = Integer.parseInt(value.toString()); - mWifiManager.enableNetwork(netid, false); + try { + netid = Integer.parseInt(value.toString()); + } catch (NumberFormatException e) { + // Invalid netid + e.printStackTrace(); + return; } - }); + mWifiManager.enableNetwork(netid, false); + } + }); alert.setNegativeButton("Cancel", new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { // Canceled.