From 8c461c6fc6e060cb868e1492cc833c19fdeea0c2 Mon Sep 17 00:00:00 2001 From: Yuhao Zheng Date: Mon, 16 Sep 2013 12:43:00 -0700 Subject: [PATCH] Fix Settings app crash while enabling tethering While enabling Portable Wifi hotspot in Settings, a null WifiConfiguration is provided. This null config is on purpose and meanful, and it should bypass the validation test to avoid the NullPointerException. Bug: 10780414 Change-Id: Ic507ecae463946c925b3d5fb5a1d185b37db410f --- services/java/com/android/server/wifi/WifiService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/java/com/android/server/wifi/WifiService.java b/services/java/com/android/server/wifi/WifiService.java index 5a24ebb4cb1f7..2ae254c4044a3 100644 --- a/services/java/com/android/server/wifi/WifiService.java +++ b/services/java/com/android/server/wifi/WifiService.java @@ -582,7 +582,8 @@ public final class WifiService extends IWifiManager.Stub { */ public void setWifiApEnabled(WifiConfiguration wifiConfig, boolean enabled) { enforceChangePermission(); - if (wifiConfig.isValid()) { + // null wifiConfig is a meaningful input for CMD_SET_AP + if (wifiConfig == null || wifiConfig.isValid()) { mWifiController.obtainMessage(CMD_SET_AP, enabled ? 1 : 0, 0, wifiConfig).sendToTarget(); } else { Slog.e(TAG, "Invalid WifiConfiguration");