summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--service/jni/com_android_server_wifi_WifiNative.cpp2
-rw-r--r--service/jni/wifi_hal_stub.h3
-rw-r--r--service/lib/wifi_hal_stub.cpp3
3 files changed, 3 insertions, 5 deletions
diff --git a/service/jni/com_android_server_wifi_WifiNative.cpp b/service/jni/com_android_server_wifi_WifiNative.cpp
index e9a034e9d..4128625d3 100644
--- a/service/jni/com_android_server_wifi_WifiNative.cpp
+++ b/service/jni/com_android_server_wifi_WifiNative.cpp
@@ -1374,7 +1374,7 @@ static jboolean android_net_wifi_set_Country_Code_Hal(JNIEnv *env,jclass cls, ji
// Debug framework
// ----------------------------------------------------------------------------
-static void onRingBufferData(wifi_request_id id, wifi_ring_buffer_id ring_id, char * buffer,
+static void onRingBufferData(char * ring_name, char * buffer,
int buffer_size, wifi_ring_buffer_status *status) {
JNIEnv *env = NULL;
mVM->AttachCurrentThread(&env, NULL);
diff --git a/service/jni/wifi_hal_stub.h b/service/jni/wifi_hal_stub.h
index 749508d67..f1a535fd4 100644
--- a/service/jni/wifi_hal_stub.h
+++ b/service/jni/wifi_hal_stub.h
@@ -68,8 +68,7 @@ wifi_error wifi_get_link_stats_stub(wifi_request_id id,
wifi_rtt_capabilities *capabilities);
wifi_error wifi_set_nodfs_flag_stub(wifi_interface_handle iface, u32 nodfs);
wifi_error wifi_start_logging_stub(wifi_interface_handle iface, u32 verbose_level, u32 flags,
- u32 max_interval_sec, u32 min_data_size, u8 *buffer_name,
- wifi_ring_buffer_data_handler handler);
+ u32 max_interval_sec, u32 min_data_size, char *buffer_name);
wifi_error wifi_set_epno_list_stub(int id, wifi_interface_info *iface, int num_networks,
wifi_epno_network *networks, wifi_epno_handler handler);
wifi_error wifi_set_country_code_stub(wifi_interface_handle iface, const char *code);
diff --git a/service/lib/wifi_hal_stub.cpp b/service/lib/wifi_hal_stub.cpp
index 10bda4bc7..5ba413218 100644
--- a/service/lib/wifi_hal_stub.cpp
+++ b/service/lib/wifi_hal_stub.cpp
@@ -154,8 +154,7 @@ wifi_error wifi_set_nodfs_flag_stub(wifi_interface_handle iface, u32 nodfs) {
}
wifi_error wifi_start_logging_stub(wifi_interface_handle iface, u32 verbose_level, u32 flags,
- u32 max_interval_sec, u32 min_data_size, u8 *buffer_name,
- wifi_ring_buffer_data_handler handler) {
+ u32 max_interval_sec, u32 min_data_size, char *buffer_name) {
return WIFI_ERROR_NOT_SUPPORTED;
}