From 4e62fd3f95ee824e6addf438f9e1155a8e0b8e2a Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Thu, 29 Mar 2012 17:19:42 -0700 Subject: [PATCH] Wifi: change empty "engine" config to integer "engine" is specified as an integer in wpa_supplicant, so we have to make sure we send an integer instead of a NULL when we want to disable it. Bug: 6250670 Change-Id: I693ccb49badbd400a5882e9df1bbd4febc847a6e --- wifi/java/android/net/wifi/WifiConfigStore.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/wifi/java/android/net/wifi/WifiConfigStore.java b/wifi/java/android/net/wifi/WifiConfigStore.java index a9dbd10b293eb..3c761c8024394 100644 --- a/wifi/java/android/net/wifi/WifiConfigStore.java +++ b/wifi/java/android/net/wifi/WifiConfigStore.java @@ -1141,7 +1141,15 @@ class WifiConfigStore { String varName = field.varName(); String value = field.value(); if (value != null) { - if (field != config.eap && field != config.engine) { + if (field == config.engine) { + /* + * If the field is declared as an integer, it must not + * be null + */ + if (value.length() == 0) { + value = "0"; + } + } else if (field != config.eap) { value = (value.length() == 0) ? "NULL" : convertToQuotedString(value); } if (!mWifiNative.setNetworkVariable(