summaryrefslogtreecommitdiffstats
path: root/service/jni
diff options
context:
space:
mode:
authorVinit Deshpande <vinitd@google.com>2015-03-19 12:24:53 -0700
committerVinit Deshpande <vinitd@google.com>2015-03-19 12:45:56 -0700
commit7d6301ead19afdf3de37455e9ed133c25b4938cd (patch)
treed78b9e0b01fa101fd486af69b23c677d88d6db3a /service/jni
parentc03c14696493a3763948feed7f1e75e77e2a2f9b (diff)
downloadandroid_frameworks_opt_net_wifi-7d6301ead19afdf3de37455e9ed133c25b4938cd.tar.gz
android_frameworks_opt_net_wifi-7d6301ead19afdf3de37455e9ed133c25b4938cd.tar.bz2
android_frameworks_opt_net_wifi-7d6301ead19afdf3de37455e9ed133c25b4938cd.zip
Fix a runtime crash introduced by incorrect JNI mapping
Change-Id: Ie37d8a8788e8bdc3a5f52b2ff58be3506943bf9d
Diffstat (limited to 'service/jni')
-rw-r--r--service/jni/com_android_server_wifi_WifiNative.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/service/jni/com_android_server_wifi_WifiNative.cpp b/service/jni/com_android_server_wifi_WifiNative.cpp
index f40284be8..9734f3902 100644
--- a/service/jni/com_android_server_wifi_WifiNative.cpp
+++ b/service/jni/com_android_server_wifi_WifiNative.cpp
@@ -1303,11 +1303,10 @@ int buffer_size, wifi_ring_buffer_status *status) {
0, 0);
}
-static jboolean android_net_wifi_start_logging(
- JNIEnv *env, jclass cls, jint iface, jint id, jobject params) {
+static jboolean android_net_wifi_start_logging(JNIEnv *env, jclass cls, jint iface) {
wifi_interface_handle handle = getIfaceHandle(env, cls, iface);
- ALOGD("android_net_wifi_start_logging [%d] = %p", id, handle);
+ ALOGD("android_net_wifi_start_logging = %p", handle);
if (handle == 0) {
return WIFI_ERROR_UNINITIALIZED;
@@ -1375,7 +1374,7 @@ static JNINativeMethod gWifiMethods[] = {
{ "toggleInterfaceNative", "(I)Z", (void*) android_net_wifi_toggle_interface},
{ "getRttCapabilitiesNative", "(I)Landroid/net/wifi/RttManager$RttCapabilities;",
(void*) android_net_wifi_get_rtt_capabilities},
- { "android_net_wifi_start_logging", "(IZ)Z", (void*) android_net_wifi_start_logging}
+ { "startLogging", "(I)Z", (void*) android_net_wifi_start_logging}
};
int register_android_net_wifi_WifiNative(JNIEnv* env) {