diff options
author | Vinit Deshpande <vinitd@google.com> | 2015-06-25 12:41:57 -0700 |
---|---|---|
committer | Vinit Deshpande <vinitd@google.com> | 2015-06-25 15:04:38 -0700 |
commit | 6414301b7b685307e8ae8cea6976ed05cc49b254 (patch) | |
tree | 1351ea6b702a8e9e64ae41e7a0ddf89e854a2529 /service/jni | |
parent | 36fec67c3cec267912ef4526b088a2ec283727a8 (diff) | |
download | frameworks_opt_net_wifi-6414301b7b685307e8ae8cea6976ed05cc49b254.tar.gz frameworks_opt_net_wifi-6414301b7b685307e8ae8cea6976ed05cc49b254.tar.bz2 frameworks_opt_net_wifi-6414301b7b685307e8ae8cea6976ed05cc49b254.zip |
Re-enable Driver/Firmware based logs
Change-Id: If2c929a1156d936ac1a17681d1f171ae1f9dd1bf
Diffstat (limited to 'service/jni')
-rw-r--r-- | service/jni/com_android_server_wifi_WifiNative.cpp | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/service/jni/com_android_server_wifi_WifiNative.cpp b/service/jni/com_android_server_wifi_WifiNative.cpp index 286b711..021e382 100644 --- a/service/jni/com_android_server_wifi_WifiNative.cpp +++ b/service/jni/com_android_server_wifi_WifiNative.cpp @@ -296,7 +296,8 @@ int set_iface_flags(const char *ifname, int dev_up) { } if (ioctl(sock, SIOCSIFFLAGS, &ifr) != 0) { - ALOGE("Could not set interface %s flags \n", ifname); + ALOGE("Could not set interface %s flags: %d\n", ifname, errno); + ret = errno ? -errno : -999; close(sock); return ret; } else { @@ -1644,8 +1645,8 @@ static void on_ring_buffer_data(char *ring_name, char *buffer, int buffer_size, JNIEnv *env = NULL; mVM->AttachCurrentThread(&env, NULL); - ALOGD("on_ring_buffer_data called, vm = %p, obj = %p, env = %p buffer size = %d", mVM, - mCls, env, buffer_size); + /* ALOGD("on_ring_buffer_data called, vm = %p, obj = %p, env = %p buffer size = %d", mVM, + mCls, env, buffer_size); */ jobject ringStatus = createObject(env, "com/android/server/wifi/WifiNative$RingBufferStatus"); @@ -1748,8 +1749,7 @@ static jboolean android_net_wifi_start_logging_ring_buffer(JNIEnv *env, jclass c static jboolean android_net_wifi_get_ring_buffer_data(JNIEnv *env, jclass cls, jint iface, jstring ring_name) { wifi_interface_handle handle = getIfaceHandle(env, cls, iface); - ALOGD("android_net_wifi_get_ring_buffer_data = %p", handle); - + // ALOGD("android_net_wifi_get_ring_buffer_data = %p", handle); const char* ring_name_const_char = env->GetStringUTFChars(ring_name, JNI_FALSE); int len; @@ -1759,11 +1759,6 @@ static jboolean android_net_wifi_get_ring_buffer_data(JNIEnv *env, jclass cls, j int result = hal_fn.wifi_get_ring_data(handle, ring_name_char); - if (result == WIFI_SUCCESS) - ALOGD("Get Ring data command success\n"); - else - ALOGE("Failed to execute get ring data command\n"); - env->ReleaseStringUTFChars(ring_name, ring_name_char); return result == WIFI_SUCCESS; } @@ -1772,8 +1767,8 @@ static jboolean android_net_wifi_get_ring_buffer_data(JNIEnv *env, jclass cls, j void on_firmware_memory_dump(char *buffer, int buffer_size) { JNIEnv *env = NULL; mVM->AttachCurrentThread(&env, NULL); - ALOGD("on_firmware_memory_dump called, vm = %p, obj = %p, env = %p buffer_size = %d" - , mVM, mCls, env, buffer_size); + /* ALOGD("on_firmware_memory_dump called, vm = %p, obj = %p, env = %p buffer_size = %d" + , mVM, mCls, env, buffer_size); */ if (buffer_size > 0) { jbyteArray dump = env->NewByteArray(buffer_size); @@ -1787,7 +1782,7 @@ void on_firmware_memory_dump(char *buffer, int buffer_size) { static jboolean android_net_wifi_get_fw_memory_dump(JNIEnv *env, jclass cls, jint iface){ wifi_interface_handle handle = getIfaceHandle(env, cls, iface); - ALOGD("android_net_wifi_get_fw_memory_dump = %p", handle); + // ALOGD("android_net_wifi_get_fw_memory_dump = %p", handle); if (handle == NULL) { ALOGE("Can not get wifi_interface_handle"); |