1 files changed, 2 insertions, 42 deletions
diff --git a/src/wifi/qwifidevice.cpp b/src/wifi/qwifidevice.cpp
index 0b52780..5ddc02b 100644
--- a/src/wifi/qwifidevice.cpp
+++ b/src/wifi/qwifidevice.cpp
@@ -20,10 +20,6 @@
 
 #include <QtCore/QByteArray>
 #include <QtCore/QDir>
-#ifdef Q_OS_ANDROID_NO_SDK
-#include <hardware_legacy/wifi.h>
-#include <cutils/properties.h>
-#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -97,41 +93,18 @@ QWifiDevice::~QWifiDevice()
 */
 bool QWifiDevice::wifiSupported()
 {
-#ifdef Q_OS_ANDROID_NO_SDK
-    const char *fwpath = 0;
-    // reload wifi firmware
-    fwpath = (char *)wifi_get_fw_path(WIFI_GET_FW_PATH_STA);
-    if (!fwpath) {
-        qCWarning(B2QT_WIFI) << "failed to get firmware path";
-        return false;
-    }
-    if (wifi_change_fw_path((const char *)fwpath)) {
-        qCWarning(B2QT_WIFI) << "failed to change firmware path";
-        return false;
-    }
-#endif
     QByteArray ifc = wifiInterfaceName();
     bool hasInterface = QDir().exists(QString::fromLatin1("/sys/class/net/" + ifc));
     if (!hasInterface)
         qCWarning(B2QT_WIFI) << "could not find wifi interface in \"/sys/class/net/\", "
                                  "looking for interface named: " << ifc;
-#ifdef Q_OS_ANDROID_NO_SDK
-    if (hasInterface && wifi_load_driver() == 0) {
-        return true;
-    } else {
-        qCWarning(B2QT_WIFI) << "wifi driver is not available";
-        return false;
-    }
-#else
     return hasInterface;
-#endif
 }
 
 /*!
     Returns Wifi interface name.
 
-    \note On Android, the Wifi interface name is read from "wifi.interface"
-    system property. On Linux, it is read from the \c B2QT_WIFI_INTERFACE
+    Interface name is obtained from the \c B2QT_WIFI_INTERFACE
     environment variable if it is set, otherwise, the default interface
     name ("\e{wlan0}") is used.
 
@@ -139,16 +112,7 @@ bool QWifiDevice::wifiSupported()
  */
 QByteArray QWifiDevice::wifiInterfaceName()
 {
-    QByteArray ifc;
-#ifdef Q_OS_ANDROID_NO_SDK
-    char interface[PROPERTY_VALUE_MAX];
-    property_get("wifi.interface", interface, NULL);
-    ifc = interface[0] == '\0' ? "wlan0" : interface;
-#else
-    ifc = qEnvironmentVariableIsSet("B2QT_WIFI_INTERFACE")
-            ? qgetenv("B2QT_WIFI_INTERFACE") : "wlan0";
-#endif
-    return ifc;
+    return qEnvironmentVariableIsSet("B2QT_WIFI_INTERFACE") ? qgetenv("B2QT_WIFI_INTERFACE") : "wlan0";
 }
 
 /*!
@@ -158,11 +122,7 @@ QByteArray QWifiDevice::wifiInterfaceName()
  */
 void QWifiDevice::setWifiInterfaceName(const QByteArray &name)
 {
-#ifdef Q_OS_ANDROID_NO_SDK
-    property_set("wifi.interface", name);
-#else
     qputenv("B2QT_WIFI_INTERFACE", name);
-#endif
 }
 
 QT_END_NAMESPACE