summaryrefslogtreecommitdiffstats
path: root/libwifi_system/include/wifi_system
diff options
context:
space:
mode:
authorNingyuan Wang <nywang@google.com>2017-03-28 17:11:23 -0700
committerNingyuan Wang <nywang@google.com>2017-03-31 13:18:24 -0700
commitff66f41f8f457bf5e9c0c75d72dbe74f9dfc3102 (patch)
tree76875487f95874f04e7fb473e5d07523619226e7 /libwifi_system/include/wifi_system
parent6236c87501a724cdb4e727b1631ee11db106460c (diff)
downloadandroid_frameworks_opt_net_wifi-ff66f41f8f457bf5e9c0c75d72dbe74f9dfc3102.tar.gz
android_frameworks_opt_net_wifi-ff66f41f8f457bf5e9c0c75d72dbe74f9dfc3102.tar.bz2
android_frameworks_opt_net_wifi-ff66f41f8f457bf5e9c0c75d72dbe74f9dfc3102.zip
lib-wifisystem: Remove unused dependencies
This removes ununsed libwpa_client, libnetutils, libnl from libwifi-system. This also removes wifi.h and wifi.cpp. The only useful function ensure_entropy_file_exists() is moved to SupplicantManager. Bug: 36697996 Test: compile, manual test: wifi works with toggling Change-Id: I1f55813ee43a821d18d2368c1cc28a3bf95b6c93
Diffstat (limited to 'libwifi_system/include/wifi_system')
-rw-r--r--libwifi_system/include/wifi_system/supplicant_manager.h3
-rw-r--r--libwifi_system/include/wifi_system/wifi.h84
2 files changed, 3 insertions, 84 deletions
diff --git a/libwifi_system/include/wifi_system/supplicant_manager.h b/libwifi_system/include/wifi_system/supplicant_manager.h
index c666fc95a..e6a5789a9 100644
--- a/libwifi_system/include/wifi_system/supplicant_manager.h
+++ b/libwifi_system/include/wifi_system/supplicant_manager.h
@@ -38,6 +38,9 @@ class SupplicantManager {
// Returns true iff supplicant is still running.
virtual bool IsSupplicantRunning();
+ // Returns true iff supplicant entropy file exists.
+ static bool EnsureEntropyFileExists();
+
private:
DISALLOW_COPY_AND_ASSIGN(SupplicantManager);
}; // class SupplicantManager
diff --git a/libwifi_system/include/wifi_system/wifi.h b/libwifi_system/include/wifi_system/wifi.h
deleted file mode 100644
index 6d017ecc5..000000000
--- a/libwifi_system/include/wifi_system/wifi.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ANDROID_WIFI_SYSTEM_WIFI_H
-#define ANDROID_WIFI_SYSTEM_WIFI_H
-
-#include <cstddef>
-
-namespace android {
-namespace wifi_system {
-
-extern const char kWiFiEntropyFile[];
-
-/**
- * Open a connection to supplicant
- *
- * @return 0 on success, < 0 on failure.
- */
-int wifi_connect_to_supplicant();
-
-/**
- * Close connection to supplicant
- *
- * @return 0 on success, < 0 on failure.
- */
-void wifi_close_supplicant_connection();
-
-/**
- * wifi_wait_for_event() performs a blocking call to
- * get a Wi-Fi event and returns a string representing
- * a Wi-Fi event when it occurs.
- *
- * @param buf is the buffer that receives the event
- * @param len is the maximum length of the buffer
- *
- * @returns number of bytes in buffer, 0 if no
- * event (for instance, no connection), and less than 0
- * if there is an error.
- */
-int wifi_wait_for_event(char* buf, size_t len);
-
-/**
- * wifi_command() issues a command to the Wi-Fi driver.
- *
- * Android extends the standard commands listed at
- * /link http://hostap.epitest.fi/wpa_supplicant/devel/ctrl_iface_page.html
- * to include support for sending commands to the driver:
- *
- * See wifi/java/android/net/wifi/WifiNative.java for the details of
- * driver commands that are supported
- *
- * @param command is the string command (preallocated with 32 bytes)
- * @param commandlen is command buffer length
- * @param reply is a buffer to receive a reply string
- * @param reply_len on entry, this is the maximum length of
- * the reply buffer. On exit, the number of
- * bytes in the reply buffer.
- *
- * @return 0 if successful, < 0 if an error.
- */
-int wifi_command(const char* command, char* reply, size_t* reply_len);
-
-/**
- * Check and create if necessary initial entropy file
- */
-int ensure_entropy_file_exists();
-
-} // namespace wifi_system
-} // namespace android
-
-#endif // ANDROID_WIFI_SYSTEM_WIFI_H