Merge "Fix Settings app crash while enabling tethering" into klp-dev (af672998) · Commits · e / os / android_frameworks_base

services/java/com/android/server/wifi/WifiService.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -588,7 +588,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");