commit 269ca58878ded48ed5e9443fd1a2dee66a220251
author Vinit Deshpande <vinitd@google.com> Thu Aug 06 21:06:12 2015 -0700
committer Vinit Deshpande <vinitd@google.com> Thu Aug 06 21:10:11 2015 -0700
tree 0561ac778f87027ae5144fdc4c0d6d82b7bfd2ec
parent 9a89da6eb4b307ff05ca2b74249c8eefc39038dd

Fix build breaks caused by merge conflicts et al

Change-Id: I1daa67506300018228841e4568576c0312f5f073

service/jni/com_android_server_wifi_WifiNative.cpp

diff --git a/service/jni/com_android_server_wifi_WifiNative.cpp b/service/jni/com_android_server_wifi_WifiNative.cpp
index c5fa532..3c7270a 100644
--- a/service/jni/com_android_server_wifi_WifiNative.cpp
+++ b/service/jni/com_android_server_wifi_WifiNative.cpp
@@ -1292,9 +1292,7 @@
         return false;
     }
 
-    wifi_error ret = hal_fn.wifi_set_scanning_mac_oui(handle, (byte *)bytes);
-    env->ReleaseByteArrayElements(param, bytes, 0);
-    return ret == WIFI_SUCCESS;
+    return hal_fn.wifi_set_scanning_mac_oui(handle, (byte *)bytes) == WIFI_SUCCESS;
 }
 
 static jboolean android_net_wifi_is_get_channels_for_band_supported(JNIEnv *env, jclass cls){