diff options
| author | Vinit Deshpande <vinitd@google.com> | 2015-06-25 00:55:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-25 00:55:26 +0000 |
| commit | 36fec67c3cec267912ef4526b088a2ec283727a8 (patch) | |
| tree | d0db3b399ec9d262c7af447403cecb04303d324c /service | |
| parent | 87e2455ee2a232db01029a93edea179528d1a5c2 (diff) | |
| parent | 32cbc7acce70697ccf7881324bf8a6861905e899 (diff) | |
| download | android_frameworks_opt_net_wifi-36fec67c3cec267912ef4526b088a2ec283727a8.tar.gz android_frameworks_opt_net_wifi-36fec67c3cec267912ef4526b088a2ec283727a8.tar.bz2 android_frameworks_opt_net_wifi-36fec67c3cec267912ef4526b088a2ec283727a8.zip | |
Merge "Add a debuggability interface: stop logging" into mnc-dev
Diffstat (limited to 'service')
| -rw-r--r-- | service/jni/com_android_server_wifi_WifiNative.cpp | 1 | ||||
| -rw-r--r-- | service/jni/wifi_hal_stub.h | 1 | ||||
| -rw-r--r-- | service/lib/wifi_hal_stub.cpp | 4 |
3 files changed, 6 insertions, 0 deletions
diff --git a/service/jni/com_android_server_wifi_WifiNative.cpp b/service/jni/com_android_server_wifi_WifiNative.cpp index a245553c7..286b711ea 100644 --- a/service/jni/com_android_server_wifi_WifiNative.cpp +++ b/service/jni/com_android_server_wifi_WifiNative.cpp @@ -80,6 +80,7 @@ int init_wifi_hal_func_table(wifi_hal_fn *hal_fn) { hal_fn->wifi_set_nodfs_flag = wifi_set_nodfs_flag_stub; hal_fn->wifi_get_firmware_memory_dump = wifi_get_firmware_memory_dump_stub; hal_fn->wifi_set_log_handler = wifi_set_log_handler_stub; + hal_fn->wifi_reset_log_handler = wifi_reset_log_handler_stub; hal_fn->wifi_set_alert_handler = wifi_set_alert_handler_stub; hal_fn->wifi_get_firmware_version = wifi_get_firmware_version_stub; hal_fn->wifi_get_ring_buffers_status = wifi_get_ring_buffers_status_stub; diff --git a/service/jni/wifi_hal_stub.h b/service/jni/wifi_hal_stub.h index f02e6322f..30b05567c 100644 --- a/service/jni/wifi_hal_stub.h +++ b/service/jni/wifi_hal_stub.h @@ -76,6 +76,7 @@ wifi_error wifi_get_firmware_memory_dump_stub( wifi_interface_handle iface, wifi_firmware_memory_dump_handler handler); wifi_error wifi_set_log_handler_stub(wifi_request_id id, wifi_interface_handle iface, wifi_ring_buffer_data_handler handler); +wifi_error wifi_reset_log_handler_stub(wifi_request_id id, wifi_interface_handle iface); wifi_error wifi_set_alert_handler_stub(wifi_request_id id, wifi_interface_handle iface, wifi_alert_handler handler); wifi_error wifi_get_firmware_version_stub(wifi_interface_handle iface, char *buffer, diff --git a/service/lib/wifi_hal_stub.cpp b/service/lib/wifi_hal_stub.cpp index fb86ff9e0..ded2115a3 100644 --- a/service/lib/wifi_hal_stub.cpp +++ b/service/lib/wifi_hal_stub.cpp @@ -161,6 +161,10 @@ wifi_error wifi_set_log_handler_stub(wifi_request_id id, wifi_interface_handle i return WIFI_ERROR_NOT_SUPPORTED; } +wifi_error wifi_reset_log_handler_stub(wifi_request_id id, wifi_interface_handle iface) { + return WIFI_ERROR_NOT_SUPPORTED; +} + wifi_error wifi_set_alert_handler_stub(wifi_request_id id, wifi_interface_handle iface, wifi_alert_handler handler) { return WIFI_ERROR_NOT_SUPPORTED; |