Remove all legacy HAL usage from framework

WifiNative now just becomes a module to route calls into the appropriate
native module: WifiVendorHal, WificondControl, SupplicantStaIfaceHal,
SupplicantP2pIfaceHal.

Changes in the CL:
1. Cleanup WifiNative to remove the legacy HAL usage.
2. Remove the |HIDL*| flags in WifiNative.
3. Remove static instance of WifiNative/WifiMonitor.
4. Remove WifiMonitor code parsing the string events from
wpa_supplicant.
5. Remove all unused jni code used for legacy HAL interactions.
6. Remove dependency of libwifi-hal & libwifi-system from framework.

Notes:
a) We can now potentially split up WifiNative into separate chunks:
WifiStaNative, WifiP2pNative, WifiRttNative, etc instead of having a
monolithic WifiNative instance.
b) We may have to add back the local log in WifiNative (b/36059665).

Bug: 35702893
Bug: 34457880
Bug: 34884202
Bug: 35421721
Test: Compiles, existing unit tests pass.
Test: Device boots up and connects to wifi networks.
Test: Verified with wifi regression (b/36068282)

Change-Id: I3e13522c912242af8023471e029edb1ce47fd3e9

3 files changed, 13 insertions, 3138 deletions

diff --git a/service/jni/com_android_server_wifi_WifiNative.cpp b/service/jni/com_android_server_wifi_WifiNative.cpp
index 7c1a1cbab..cf3502861 100644
--- a/service/jni/com_android_server_wifi_WifiNative.cpp
+++ b/service/jni/com_android_server_wifi_WifiNative.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008, The Android Open Source Project
+ * Copyright 2017, The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,2333 +14,22 @@
  * limitations under the License.
  */
 
-#define LOG_TAG "wifi"
+#define LOG_TAG "wifi-jni"
 
 #include <ctype.h>
 #include <stdlib.h>
 #include <sys/klog.h>
-#include <sys/socket.h>
-/* We need linux/if_arp.h for ARPHRD_ETHER.  Sadly, it forward declares
-   struct sockaddr and must be included after sys/socket.h. */
-#include <linux/if_arp.h>
 
-#include <algorithm>
-#include <limits>
-#include <vector>
-
-#include <hardware_legacy/rtt.h>
-#include <hardware_legacy/wifi.h>
-#include <hardware_legacy/wifi_hal.h>
 #include <log/log.h>
 #include <nativehelper/JniConstants.h>
 #include <nativehelper/ScopedBytes.h>
 #include <nativehelper/ScopedUtfChars.h>
 #include <nativehelper/jni.h>
-#include <utils/String16.h>
-#include <utils/misc.h>
-#include <wifi_system/hal_tool.h>
-#include <wifi_system/interface_tool.h>
-#include <wifi_system/wifi.h>
 
 #include "jni_helper.h"
 
-#define REPLY_BUF_SIZE (4096 + 1)         // wpa_supplicant's maximum size + 1 for nul
-#define EVENT_BUF_SIZE 2048
-#define WAKE_REASON_TYPE_MAX 10
-
-using android::wifi_system::HalTool;
-using android::wifi_system::InterfaceTool;
-
 namespace android {
 
-extern "C"
-jint Java_com_android_server_wifi_WifiNative_registerAwareNatives(JNIEnv* env, jclass clazz);
-
-static jint DBG = false;
-
-//Please put all HAL function call here and call from the function table instead of directly call
-wifi_hal_fn hal_fn;
-static bool doCommand(JNIEnv* env, jstring javaCommand,
-                      char* reply, size_t reply_len) {
-    ScopedUtfChars command(env, javaCommand);
-    if (command.c_str() == NULL) {
-        return false; // ScopedUtfChars already threw on error.
-    }
-
-    if (DBG) {
-        ALOGD("doCommand: %s", command.c_str());
-    }
-
-    --reply_len; // Ensure we have room to add NUL termination.
-    if (wifi_system::wifi_command(command.c_str(), reply, &reply_len) != 0) {
-        return false;
-    }
-
-    // Strip off trailing newline.
-    if (reply_len > 0 && reply[reply_len-1] == '\n') {
-        reply[reply_len-1] = '\0';
-    } else {
-        reply[reply_len] = '\0';
-    }
-    return true;
-}
-
-static jint doIntCommand(JNIEnv* env, jstring javaCommand) {
-    char reply[REPLY_BUF_SIZE];
-    if (!doCommand(env, javaCommand, reply, sizeof(reply))) {
-        return -1;
-    }
-    return static_cast<jint>(atoi(reply));
-}
-
-static jboolean doBooleanCommand(JNIEnv* env, jstring javaCommand) {
-    char reply[REPLY_BUF_SIZE];
-    if (!doCommand(env, javaCommand, reply, sizeof(reply))) {
-        return JNI_FALSE;
-    }
-    jboolean result = (strcmp(reply, "OK") == 0);
-    if (!result) {
-        ScopedUtfChars command(env, javaCommand);
-        ALOGI("command '%s' returned '%s", command.c_str(), reply);
-    }
-    return result;
-}
-
-// Send a command to the supplicant, and return the reply as a String.
-static jstring doStringCommand(JNIEnv* env, jstring javaCommand) {
-    char reply[REPLY_BUF_SIZE];
-    if (!doCommand(env, javaCommand, reply, sizeof(reply))) {
-        return NULL;
-    }
-    return env->NewStringUTF(reply);
-}
-
-static jboolean android_net_wifi_connectToSupplicant(JNIEnv* env, jclass)
-{
-    return (wifi_system::wifi_connect_to_supplicant() == 0);
-}
-
-static void android_net_wifi_closeSupplicantConnection(JNIEnv* env, jclass)
-{
-    wifi_system::wifi_close_supplicant_connection();
-}
-
-static jstring android_net_wifi_waitForEvent(JNIEnv* env, jclass)
-{
-    char buf[EVENT_BUF_SIZE];
-    int nread = wifi_system::wifi_wait_for_event(buf, sizeof buf);
-    if (nread > 0) {
-        return env->NewStringUTF(buf);
-    } else {
-        return NULL;
-    }
-}
-
-static jboolean android_net_wifi_doBooleanCommand(JNIEnv* env, jclass, jstring javaCommand) {
-    return doBooleanCommand(env, javaCommand);
-}
-
-static jint android_net_wifi_doIntCommand(JNIEnv* env, jclass, jstring javaCommand) {
-    return doIntCommand(env, javaCommand);
-}
-
-static jstring android_net_wifi_doStringCommand(JNIEnv* env, jclass, jstring javaCommand) {
-    return doStringCommand(env,javaCommand);
-}
-
-/* wifi_hal <==> WifiNative bridge */
-
-static jclass mCls;                             /* saved WifiNative object */
-static JavaVM *mVM;                             /* saved JVM pointer */
-
-static const char *WifiHandleVarName = "sWifiHalHandle";
-static const char *WifiIfaceHandleVarName = "sWifiIfaceHandles";
-
-wifi_handle getWifiHandle(JNIHelper &helper, jclass cls) {
-    return (wifi_handle) helper.getStaticLongField(cls, WifiHandleVarName);
-}
-
-wifi_interface_handle getIfaceHandle(JNIHelper &helper, jclass cls, jint index) {
-    return (wifi_interface_handle) helper.getStaticLongArrayField(cls, WifiIfaceHandleVarName, index);
-}
-
-jboolean setSSIDField(JNIHelper helper, jobject scanResult, const char *rawSsid) {
-
-    int len = strlen(rawSsid);
-
-    if (len > 0) {
-        JNIObject<jbyteArray> ssidBytes = helper.newByteArray(len);
-        helper.setByteArrayRegion(ssidBytes, 0, len, (jbyte *) rawSsid);
-        jboolean ret = helper.callStaticMethod(mCls,
-                "setSsid", "([BLandroid/net/wifi/ScanResult;)Z", ssidBytes.get(), scanResult);
-        return ret;
-    } else {
-        //empty SSID or SSID start with \0
-        return true;
-    }
-}
-static JNIObject<jobject> createScanResult(JNIHelper &helper, wifi_scan_result *result,
-        bool fill_ie) {
-    // ALOGD("creating scan result");
-    JNIObject<jobject> scanResult = helper.createObject("android/net/wifi/ScanResult");
-    if (scanResult == NULL) {
-        ALOGE("Error in creating scan result");
-        return JNIObject<jobject>(helper, NULL);
-    }
-
-    ALOGV("setting SSID to %s", result->ssid);
-
-    if (!setSSIDField(helper, scanResult, result->ssid)) {
-        ALOGE("Error on set SSID");
-        return JNIObject<jobject>(helper, NULL);
-    }
-
-    char bssid[32];
-    snprintf(bssid, sizeof(bssid), "%02x:%02x:%02x:%02x:%02x:%02x",
-             result->bssid[0], result->bssid[1], result->bssid[2],
-             result->bssid[3], result->bssid[4], result->bssid[5]);
-
-    helper.setStringField(scanResult, "BSSID", bssid);
-
-    helper.setIntField(scanResult, "level", result->rssi);
-    helper.setIntField(scanResult, "frequency", result->channel);
-    helper.setLongField(scanResult, "timestamp", result->ts);
-
-    if (fill_ie) {
-        JNIObject<jbyteArray> elements = helper.newByteArray(result->ie_length);
-        if (elements == NULL) {
-            ALOGE("Error in allocating elements array, length=%d", result->ie_length);
-            return JNIObject<jobject>(helper, NULL);
-        }
-        jbyte * bytes = (jbyte *)&(result->ie_data[0]);
-        helper.setByteArrayRegion(elements, 0, result->ie_length, bytes);
-        helper.setObjectField(scanResult, "bytes", "[B", elements);
-    }
-
-    return scanResult;
-}
-
-static jboolean android_net_wifi_startHal(JNIEnv* env, jclass cls) {
-    InterfaceTool if_tool;
-    JNIHelper helper(env);
-    wifi_handle halHandle = getWifiHandle(helper, cls);
-    if (halHandle != NULL) {
-        return if_tool.SetWifiUpState(true);
-    }
-
-    HalTool hal_tool;
-    if (!hal_tool.InitFunctionTable(&hal_fn)) {
-        return false;
-    }
-
-    if(!if_tool.SetWifiUpState(true)) {
-        ALOGE("Failed to set WiFi interface up");
-        return false;
-    }
-
-    const bool was_started = hal_fn.wifi_initialize(&halHandle) == WIFI_SUCCESS;
-    if (was_started) {
-        helper.setStaticLongField(cls, WifiHandleVarName, (jlong)halHandle);
-        ALOGD("Did set static halHandle = %p", halHandle);
-    }
-    env->GetJavaVM(&mVM);
-    mCls = (jclass) env->NewGlobalRef(cls);
-    ALOGD("halHandle = %p, mVM = %p, mCls = %p", halHandle, mVM, mCls);
-    return was_started;
-}
-
-void android_net_wifi_hal_cleaned_up_handler(wifi_handle handle) {
-    ALOGD("In wifi cleaned up handler");
-
-    JNIHelper helper(mVM);
-    helper.setStaticLongField(mCls, WifiHandleVarName, 0);
-
-    helper.deleteGlobalRef(mCls);
-    mCls = NULL;
-    mVM  = NULL;
-}
-
-static void android_net_wifi_stopHal(JNIEnv* env, jclass cls) {
-    ALOGD("In wifi stop Hal");
-
-    JNIHelper helper(env);
-    wifi_handle halHandle = getWifiHandle(helper, cls);
-    if (halHandle == NULL)
-        return;
-
-    ALOGD("halHandle = %p, mVM = %p, mCls = %p", halHandle, mVM, mCls);
-    hal_fn.wifi_cleanup(halHandle, android_net_wifi_hal_cleaned_up_handler);
-}
-
-static void android_net_wifi_waitForHalEvents(JNIEnv* env, jclass cls) {
-
-    ALOGD("waitForHalEvents called, vm = %p, obj = %p, env = %p", mVM, mCls, env);
-
-    JNIHelper helper(env);
-    wifi_handle halHandle = getWifiHandle(helper, cls);
-    hal_fn.wifi_event_loop(halHandle);
-    InterfaceTool if_tool;
-    if_tool.SetWifiUpState(false);
-}
-
-static int android_net_wifi_getInterfaces(JNIEnv *env, jclass cls) {
-    int n = 0;
-
-    JNIHelper helper(env);
-
-    wifi_handle halHandle = getWifiHandle(helper, cls);
-    wifi_interface_handle *ifaceHandles = NULL;
-    int result = hal_fn.wifi_get_ifaces(halHandle, &n, &ifaceHandles);
-    if (result < 0) {
-        return result;
-    }
-
-    if (n < 0) {
-        THROW(helper,"android_net_wifi_getInterfaces no interfaces");
-        return 0;
-    }
-
-    if (ifaceHandles == NULL) {
-       THROW(helper,"android_net_wifi_getInterfaces null interface array");
-       return 0;
-    }
-
-    if (n > 8) {
-        THROW(helper,"Too many interfaces");
-        return 0;
-    }
-
-    jlongArray array = (env)->NewLongArray(n);
-    if (array == NULL) {
-        THROW(helper,"Error in accessing array");
-        return 0;
-    }
-
-    jlong elems[8];
-    for (int i = 0; i < n; i++) {
-        elems[i] = reinterpret_cast<jlong>(ifaceHandles[i]);
-    }
-
-    helper.setLongArrayRegion(array, 0, n, elems);
-    helper.setStaticLongArrayField(cls, WifiIfaceHandleVarName, array);
-
-    return (result < 0) ? result : n;
-}
-
-static jstring android_net_wifi_getInterfaceName(JNIEnv *env, jclass cls, jint i) {
-
-    char buf[EVENT_BUF_SIZE];
-
-    JNIHelper helper(env);
-
-    jlong value = helper.getStaticLongArrayField(cls, WifiIfaceHandleVarName, i);
-    wifi_interface_handle handle = (wifi_interface_handle) value;
-    int result = hal_fn.wifi_get_iface_name(handle, buf, sizeof(buf));
-    if (result < 0) {
-        return NULL;
-    } else {
-        JNIObject<jstring> name = helper.newStringUTF(buf);
-        return name.detach();
-    }
-}
-
-
-static void onScanEvent(wifi_request_id id, wifi_scan_event event) {
-
-    JNIHelper helper(mVM);
-
-    // ALOGD("onScanStatus called, vm = %p, obj = %p, env = %p", mVM, mCls, env);
-
-    helper.reportEvent(mCls, "onScanStatus", "(II)V", id, event);
-}
-
-static void onFullScanResult(wifi_request_id id, wifi_scan_result *result,
-        unsigned buckets_scanned) {
-
-    JNIHelper helper(mVM);
-
-    //ALOGD("onFullScanResult called, vm = %p, obj = %p, env = %p", mVM, mCls, env);
-
-    JNIObject<jobject> scanResult = createScanResult(helper, result, true);
-
-    if (scanResult == NULL) {
-        return;
-    }
-
-    helper.reportEvent(mCls, "onFullScanResult", "(ILandroid/net/wifi/ScanResult;II)V", id,
-            scanResult.get(), buckets_scanned, (jint) result->capability);
-}
-
-static jboolean android_net_wifi_startScan(
-        JNIEnv *env, jclass cls, jint iface, jint id, jobject settings) {
-
-    JNIHelper helper(env);
-    wifi_interface_handle handle = getIfaceHandle(helper, cls, iface);
-    // ALOGD("starting scan on interface[%d] = %p", iface, handle);
-
-    wifi_scan_cmd_params params;
-    memset(&params, 0, sizeof(params));
-
-    params.base_period = helper.getIntField(settings, "base_period_ms");
-    params.max_ap_per_scan = helper.getIntField(settings, "max_ap_per_scan");
-    params.report_threshold_percent = helper.getIntField(settings, "report_threshold_percent");
-    params.report_threshold_num_scans = helper.getIntField(settings, "report_threshold_num_scans");
-
-    ALOGD("Initialized common fields %d, %d, %d, %d", params.base_period, params.max_ap_per_scan,
-            params.report_threshold_percent, params.report_threshold_num_scans);
-
-    const char *bucket_array_type = "[Lcom/android/server/wifi/WifiNative$BucketSettings;";
-    const char *channel_array_type = "[Lcom/android/server/wifi/WifiNative$ChannelSettings;";
-
-    params.num_buckets = helper.getIntField(settings, "num_buckets");
-
-    // ALOGD("Initialized num_buckets to %d", params.num_buckets);
-
-    for (int i = 0; i < params.num_buckets; i++) {
-        JNIObject<jobject> bucket = helper.getObjectArrayField(
-                settings, "buckets", bucket_array_type, i);
-
-        params.buckets[i].bucket = helper.getIntField(bucket, "bucket");
-        params.buckets[i].band = (wifi_band) helper.getIntField(bucket, "band");
-        params.buckets[i].period = helper.getIntField(bucket, "period_ms");
-        params.buckets[i].max_period = helper.getIntField(bucket, "max_period_ms");
-        // Although HAL API allows configurable base value for the truncated
-        // exponential back off scan. Native API and above support only
-        // truncated binary exponential back off scan.
-        // Hard code value of base to 2 here.
-        params.buckets[i].base = 2;
-        params.buckets[i].step_count = helper.getIntField(bucket, "step_count");
-
-        int report_events = helper.getIntField(bucket, "report_events");
-        params.buckets[i].report_events = report_events;
-
-        if (DBG) {
-            ALOGD("bucket[%d] = %d:%d:%d:%d:%d:%d:%d", i, params.buckets[i].bucket,
-                    params.buckets[i].band, params.buckets[i].period,
-                    params.buckets[i].max_period, params.buckets[i].base,
-                    params.buckets[i].step_count, report_events);
-        }
-
-        params.buckets[i].num_channels = helper.getIntField(bucket, "num_channels");
-        // ALOGD("Initialized num_channels to %d", params.buckets[i].num_channels);
-
-        for (int j = 0; j < params.buckets[i].num_channels; j++) {
-            JNIObject<jobject> channel = helper.getObjectArrayField(
-                    bucket, "channels", channel_array_type, j);
-
-            params.buckets[i].channels[j].channel = helper.getIntField(channel, "frequency");
-            params.buckets[i].channels[j].dwellTimeMs = helper.getIntField(channel, "dwell_time_ms");
-
-            bool passive = helper.getBoolField(channel, "passive");
-            params.buckets[i].channels[j].passive = (passive ? 1 : 0);
-
-            // ALOGD("Initialized channel %d", params.buckets[i].channels[j].channel);
-        }
-    }
-
-    // ALOGD("Initialized all fields");
-
-    wifi_scan_result_handler handler;
-    memset(&handler, 0, sizeof(handler));
-    handler.on_full_scan_result = &onFullScanResult;
-    handler.on_scan_event = &onScanEvent;
-
-    return hal_fn.wifi_start_gscan(id, handle, params, handler) == WIFI_SUCCESS;
-}
-
-static jboolean android_net_wifi_stopScan(JNIEnv *env, jclass cls, jint iface, jint id) {
-
-    JNIHelper helper(env);
-    wifi_interface_handle handle = getIfaceHandle(helper, cls, iface);
-    // ALOGD("stopping scan on interface[%d] = %p", iface, handle);
-
-    return hal_fn.wifi_stop_gscan(id, handle)  == WIFI_SUCCESS;
-}
-
-static int compare_scan_result_timestamp(const void *v1, const void *v2) {
-    const wifi_scan_result *result1 = static_cast<const wifi_scan_result *>(v1);
-    const wifi_scan_result *result2 = static_cast<const wifi_scan_result *>(v2);
-    return result1->ts - result2->ts;
-}
-
-static jobject android_net_wifi_getScanResults(
-        JNIEnv *env, jclass cls, jint iface, jboolean flush)  {
-
-    JNIHelper helper(env);
-    wifi_cached_scan_results scan_data[64];
-    int num_scan_data = 64;
-
-    wifi_interface_handle handle = getIfaceHandle(helper, cls, iface);
-    // ALOGD("getting scan results on interface[%d] = %p", iface, handle);
-
-    byte b = flush ? 0xFF : 0;
-    int result = hal_fn.wifi_get_cached_gscan_results(handle, b, num_scan_data, scan_data, &num_scan_data);
-    if (result == WIFI_SUCCESS) {
-        JNIObject<jobjectArray> scanData = helper.createObjectArray(
-                "android/net/wifi/WifiScanner$ScanData", num_scan_data);
-        if (scanData == NULL) {
-            ALOGE("Error in allocating array of scanData for getScanResults, length=%d",
-                  num_scan_data);
-            return NULL;
-        }
-
-        for (int i = 0; i < num_scan_data; i++) {
-
-            JNIObject<jobject> data = helper.createObject("android/net/wifi/WifiScanner$ScanData");
-            if (data == NULL) {
-                ALOGE("Error in allocating scanData for getScanResults");
-                return NULL;
-            }
-
-            helper.setIntField(data, "mId", scan_data[i].scan_id);
-            helper.setIntField(data, "mFlags", scan_data[i].flags);
-            helper.setIntField(data, "mBucketsScanned", scan_data[i].buckets_scanned);
-
-            /* sort all scan results by timestamp */
-            qsort(scan_data[i].results, scan_data[i].num_results,
-                    sizeof(wifi_scan_result), compare_scan_result_timestamp);
-
-            JNIObject<jobjectArray> scanResults = helper.createObjectArray(
-                    "android/net/wifi/ScanResult", scan_data[i].num_results);
-            if (scanResults == NULL) {
-                ALOGE("Error in allocating scanResult array for getScanResults, length=%d",
-                      scan_data[i].num_results);
-                return NULL;
-            }
-
-            wifi_scan_result *results = scan_data[i].results;
-            for (int j = 0; j < scan_data[i].num_results; j++) {
-
-                JNIObject<jobject> scanResult = createScanResult(helper, &results[j], false);
-                if (scanResult == NULL) {
-                    ALOGE("Error in creating scan result for getScanResults");
-                    return NULL;
-                }
-
-                helper.setObjectArrayElement(scanResults, j, scanResult);
-            }
-
-            helper.setObjectField(data, "mResults", "[Landroid/net/wifi/ScanResult;", scanResults);
-            helper.setObjectArrayElement(scanData, i, data);
-        }
-
-        // ALOGD("retrieved %d scan data from interface[%d] = %p", num_scan_data, iface, handle);
-        return scanData.detach();
-    } else {
-        return NULL;
-    }
-}
-
-
-static jboolean android_net_wifi_getScanCapabilities(
-        JNIEnv *env, jclass cls, jint iface, jobject capabilities) {
-
-    JNIHelper helper(env);
-    wifi_interface_handle handle = getIfaceHandle(helper, cls, iface);
-    // ALOGD("getting scan capabilities on interface[%d] = %p", iface, handle);
-
-    wifi_gscan_capabilities c;
-    memset(&c, 0, sizeof(c));
-    int result = hal_fn.wifi_get_gscan_capabilities(handle, &c);
-    if (result != WIFI_SUCCESS) {
-        ALOGD("failed to get capabilities : %d", result);
-        return JNI_FALSE;
-    }
-
-    helper.setIntField(capabilities, "max_scan_cache_size", c.max_scan_cache_size);
-    helper.setIntField(capabilities, "max_scan_buckets", c.max_scan_buckets);
-    helper.setIntField(capabilities, "max_ap_cache_per_scan", c.max_ap_cache_per_scan);
-    helper.setIntField(capabilities, "max_rssi_sample_size", c.max_rssi_sample_size);
-    helper.setIntField(capabilities, "max_scan_reporting_threshold", c.max_scan_reporting_threshold);
-    helper.setIntField(capabilities, "max_hotlist_bssids", c.max_hotlist_bssids);
-    helper.setIntField(capabilities, "max_significant_wifi_change_aps",
-            c.max_significant_wifi_change_aps);
-    helper.setIntField(capabilities, "max_bssid_history_entries", c.max_bssid_history_entries);
-    helper.setIntField(capabilities, "max_number_epno_networks", c.max_number_epno_networks);
-    helper.setIntField(capabilities, "max_number_epno_networks_by_ssid",
-            c.max_number_epno_networks_by_ssid);
-    helper.setIntField(capabilities, "max_number_of_white_listed_ssid",
-            c.max_number_of_white_listed_ssid);
-
-    return JNI_TRUE;
-}
-
-
-static byte parseHexChar(char ch) {
-    if (isdigit(ch))
-        return ch - '0';
-    else if ('A' <= ch && ch <= 'F')
-        return ch - 'A' + 10;
-    else if ('a' <= ch && ch <= 'f')
-        return ch - 'a' + 10;
-    else {
-        ALOGE("invalid character in bssid %c", ch);
-        return 0;
-    }
-}
-
-static byte parseHexByte(const char * &str) {
-    if (str[0] == '\0') {
-        ALOGE("Passed an empty string");
-        return 0;
-    }
-    byte b = parseHexChar(str[0]);
-    if (str[1] == '\0' || str[1] == ':') {
-        str ++;
-    } else {
-        b = b << 4 | parseHexChar(str[1]);
-        str += 2;
-    }
-
-    // Skip trailing delimiter if not at the end of the string.
-    if (str[0] != '\0') {
-        str++;
-    }
-    return b;
-}
-
-static void parseMacAddress(const char *str, mac_addr addr) {
-    addr[0] = parseHexByte(str);
-    addr[1] = parseHexByte(str);
-    addr[2] = parseHexByte(str);
-    addr[3] = parseHexByte(str);
-    addr[4] = parseHexByte(str);
-    addr[5] = parseHexByte(str);
-}
-
-static bool parseMacAddress(JNIEnv *env, jobject obj, mac_addr addr) {
-    JNIHelper helper(env);
-    JNIObject<jstring> macAddrString = helper.getStringField(obj, "bssid");
-    if (macAddrString == NULL) {
-        ALOGE("Error getting bssid field");
-        return false;
-    }
-
-    ScopedUtfChars chars(env, macAddrString);
-    const char *bssid = chars.c_str();
-    if (bssid == NULL) {
-        ALOGE("Error getting bssid");
-        return false;
-    }
-
-    parseMacAddress(bssid, addr);
-    return true;
-}
-
-static void onHotlistApFound(wifi_request_id id,
-        unsigned num_results, wifi_scan_result *results) {
-
-    JNIHelper helper(mVM);
-    ALOGD("onHotlistApFound called, vm = %p, obj = %p, num_results = %d", mVM, mCls, num_results);
-
-    JNIObject<jobjectArray> scanResults = helper.newObjectArray(num_results,
-            "android/net/wifi/ScanResult", NULL);
-    if (scanResults == NULL) {
-        ALOGE("Error in allocating ScanResult array in onHotlistApFound, length=%d", num_results);
-        return;
-    }
-
-    for (unsigned i = 0; i < num_results; i++) {
-
-        JNIObject<jobject> scanResult = createScanResult(helper, &results[i], false);
-        if (scanResult == NULL) {
-            ALOGE("Error in creating scan result in onHotlistApFound");
-            return;
-        }
-
-        helper.setObjectArrayElement(scanResults, i, scanResult);
-
-        ALOGD("Found AP %32s", results[i].ssid);
-    }
-
-    helper.reportEvent(mCls, "onHotlistApFound", "(I[Landroid/net/wifi/ScanResult;)V",
-        id, scanResults.get());
-}
-
-static void onHotlistApLost(wifi_request_id id,
-        unsigned num_results, wifi_scan_result *results) {
-
-    JNIHelper helper(mVM);
-    ALOGD("onHotlistApLost called, vm = %p, obj = %p, num_results = %d", mVM, mCls, num_results);
-
-    JNIObject<jobjectArray> scanResults = helper.newObjectArray(num_results,
-            "android/net/wifi/ScanResult", NULL);
-    if (scanResults == NULL) {
-        ALOGE("Error in allocating ScanResult array onHotlistApLost, length=%d", num_results);
-        return;
-    }
-
-    for (unsigned i = 0; i < num_results; i++) {
-
-        JNIObject<jobject> scanResult = createScanResult(helper, &results[i], false);
-        if (scanResult == NULL) {
-            ALOGE("Error in creating scan result in onHotlistApLost");
-            return;
-        }
-
-        helper.setObjectArrayElement(scanResults, i, scanResult);
-
-        ALOGD("Lost AP %32s", results[i].ssid);
-    }
-
-    helper.reportEvent(mCls, "onHotlistApLost", "(I[Landroid/net/wifi/ScanResult;)V",
-        id, scanResults.get());
-}
-
-
-static jboolean android_net_wifi_setHotlist(
-        JNIEnv *env, jclass cls, jint iface, jint id, jobject ap)  {
-
-    JNIHelper helper(env);
-    wifi_interface_handle handle = getIfaceHandle(helper, cls, iface);
-    ALOGD("setting hotlist on interface[%d] = %p", iface, handle);
-
-    wifi_bssid_hotlist_params params;
-    memset(&params, 0, sizeof(params));
-
-    params.lost_ap_sample_size = helper.getIntField(ap, "apLostThreshold");
-
-    JNIObject<jobjectArray> array = helper.getArrayField(
-            ap, "bssidInfos", "[Landroid/net/wifi/WifiScanner$BssidInfo;");
-    params.num_bssid = helper.getArrayLength(array);
-
-    if (params.num_bssid == 0) {
-        ALOGE("setHotlist array length was 0");
-        return false;
-    }
-
-    if (params.num_bssid >
-            static_cast<int>(sizeof(params.ap) / sizeof(params.ap[0]))) {
-        ALOGE("setHotlist array length is too long");
-        android_errorWriteLog(0x534e4554, "31856351");
-        return false;
-    }
-
-    for (int i = 0; i < params.num_bssid; i++) {
-        JNIObject<jobject> objAp = helper.getObjectArrayElement(array, i);
-
-        JNIObject<jstring> macAddrString = helper.getStringField(objAp, "bssid");
-        if (macAddrString == NULL) {
-            ALOGE("Error getting bssid field");
-            return false;
-        }
-
-        ScopedUtfChars chars(env, macAddrString);
-        const char *bssid = chars.c_str();
-        if (bssid == NULL) {
-            ALOGE("Error getting bssid");
-            return false;
-        }
-        parseMacAddress(bssid, params.ap[i].bssid);
-
-        mac_addr addr;
-        memcpy(addr, params.ap[i].bssid, sizeof(mac_addr));
-
-        char bssidOut[32];
-        snprintf(bssidOut, sizeof(bssidOut), "%0x:%0x:%0x:%0x:%0x:%0x", addr[0],
-                 addr[1], addr[2], addr[3], addr[4], addr[5]);
-
-        ALOGD("Added bssid %s", bssidOut);
-
-        params.ap[i].low = helper.getIntField(objAp, "low");
-        params.ap[i].high = helper.getIntField(objAp, "high");
-    }
-
-    wifi_hotlist_ap_found_handler handler;
-    memset(&handler, 0, sizeof(handler));
-
-    handler.on_hotlist_ap_found = &onHotlistApFound;
-    handler.on_hotlist_ap_lost  = &onHotlistApLost;
-    return hal_fn.wifi_set_bssid_hotlist(id, handle, params, handler) == WIFI_SUCCESS;
-}
-
-static jboolean android_net_wifi_resetHotlist(JNIEnv *env, jclass cls, jint iface, jint id)  {
-
-    JNIHelper helper(env);
-    wifi_interface_handle handle = getIfaceHandle(helper, cls, iface);
-    ALOGD("resetting hotlist on interface[%d] = %p", iface, handle);
-
-    return hal_fn.wifi_reset_bssid_hotlist(id, handle) == WIFI_SUCCESS;
-}
-
-void onSignificantWifiChange(wifi_request_id id,
-        unsigned num_results, wifi_significant_change_result **results) {
-
-    JNIHelper helper(mVM);
-
-    ALOGD("onSignificantWifiChange called, vm = %p, obj = %p", mVM, mCls);
-
-    JNIObject<jobjectArray> scanResults = helper.newObjectArray(
-            num_results, "android/net/wifi/ScanResult", NULL);
-    if (scanResults == NULL) {
-        ALOGE("Error in allocating ScanResult array in onSignificantWifiChange, length=%d",
-              num_results);
-        return;
-    }
-
-    for (unsigned i = 0; i < num_results; i++) {
-
-        wifi_significant_change_result &result = *(results[i]);
-
-        JNIObject<jobject> scanResult = helper.createObject("android/net/wifi/ScanResult");
-        if (scanResult == NULL) {
-            ALOGE("Error in creating scan result in onSignificantWifiChange");
-            return;
-        }
-
-        // helper.setStringField(scanResult, "SSID", results[i].ssid);
-
-        char bssid[32];
-        snprintf(bssid, sizeof(bssid), "%02x:%02x:%02x:%02x:%02x:%02x",
-                 result.bssid[0], result.bssid[1], result.bssid[2],
-                 result.bssid[3], result.bssid[4], result.bssid[5]);
-
-        helper.setStringField(scanResult, "BSSID", bssid);
-
-        helper.setIntField(scanResult, "level", result.rssi[0]);
-        helper.setIntField(scanResult, "frequency", result.channel);
-        // helper.setLongField(scanResult, "timestamp", result.ts);
-
-        helper.setObjectArrayElement(scanResults, i, scanResult);
-    }
-
-    helper.reportEvent(mCls, "onSignificantWifiChange", "(I[Landroid/net/wifi/ScanResult;)V",
-        id, scanResults.get());
-
-}
-
-static jboolean android_net_wifi_trackSignificantWifiChange(
-        JNIEnv *env, jclass cls, jint iface, jint id, jobject settings)  {
-
-    JNIHelper helper(env);
-    wifi_interface_handle handle = getIfaceHandle(helper, cls, iface);
-    ALOGD("tracking significant wifi change on interface[%d] = %p", iface, handle);
-
-    wifi_significant_change_params params;
-    memset(&params, 0, sizeof(params));
-
-    params.rssi_sample_size = helper.getIntField(settings, "rssiSampleSize");
-    params.lost_ap_sample_size = helper.getIntField(settings, "lostApSampleSize");
-    params.min_breaching = helper.getIntField(settings, "minApsBreachingThreshold");
-
-    const char *bssid_info_array_type = "[Landroid/net/wifi/WifiScanner$BssidInfo;";
-    JNIObject<jobjectArray> bssids = helper.getArrayField(
-            settings, "bssidInfos", bssid_info_array_type);
-    params.num_bssid = helper.getArrayLength(bssids);
-
-    if (params.num_bssid == 0) {
-        ALOGE("BssidInfo array length was 0");
-        return false;
-    }
-
-    ALOGD("Initialized common fields %d, %d, %d, %d", params.rssi_sample_size,
-            params.lost_ap_sample_size, params.min_breaching, params.num_bssid);
-
-    for (int i = 0; i < params.num_bssid; i++) {
-        JNIObject<jobject> objAp = helper.getObjectArrayElement(bssids, i);
-
-        JNIObject<jstring> macAddrString = helper.getStringField(objAp, "bssid");
-        if (macAddrString == NULL) {
-            ALOGE("Error getting bssid field");
-            return false;
-        }
-
-        ScopedUtfChars chars(env, macAddrString.get());
-        const char *bssid = chars.c_str();
-        if (bssid == NULL) {
-            ALOGE("Error getting bssid");
-            return false;
-        }
-
-        mac_addr addr;
-        parseMacAddress(bssid, addr);
-        memcpy(params.ap[i].bssid, addr, sizeof(mac_addr));
-
-        char bssidOut[32];
-        snprintf(bssidOut, sizeof(bssidOut), "%02x:%02x:%02x:%02x:%02x:%02x",
-                 addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
-
-        params.ap[i].low = helper.getIntField(objAp, "low");
-        params.ap[i].high = helper.getIntField(objAp, "high");
-
-        ALOGD("Added bssid %s, [%04d, %04d]", bssidOut, params.ap[i].low, params.ap[i].high);
-    }
-
-    ALOGD("Added %d bssids", params.num_bssid);
-
-    wifi_significant_change_handler handler;
-    memset(&handler, 0, sizeof(handler));
-
-    handler.on_significant_change = &onSignificantWifiChange;
-    return hal_fn.wifi_set_significant_change_handler(id, handle, params, handler) == WIFI_SUCCESS;
-}
-
-static jboolean android_net_wifi_untrackSignificantWifiChange(
-        JNIEnv *env, jclass cls, jint iface, jint id)  {
-
-    JNIHelper helper(env);
-    wifi_interface_handle handle = getIfaceHandle(helper, cls, iface);
-    ALOGD("resetting significant wifi change on interface[%d] = %p", iface, handle);
-
-    return hal_fn.wifi_reset_significant_change_handler(id, handle) == WIFI_SUCCESS;
-}
-
-wifi_iface_stat link_stat;
-wifi_radio_stat radio_stat; // L release has support for only one radio
-u32 *tx_time_per_level_arr = 0;
-// Let's cache the supported feature set to avoid unnecessary HAL invocations.
-feature_set cached_feature_set = 0;
-
-bool isTxLevelStatsPresent(wifi_radio_stat *radio_stats) {
-    if (IS_SUPPORTED_FEATURE(WIFI_FEATURE_TX_TRANSMIT_POWER, cached_feature_set)) {
-        if(radio_stats->tx_time_per_levels != 0 && radio_stats->num_tx_levels > 0) {
-            return true;
-        } else {
-            ALOGE("Ignoring invalid tx_level info in radio_stats");
-        }
-    }
-    return false;
-}
-
-void onLinkStatsResults(wifi_request_id id, wifi_iface_stat *iface_stat,
-         int num_radios, wifi_radio_stat *radio_stats)
-{
-    if (iface_stat != 0) {
-        memcpy(&link_stat, iface_stat, sizeof(wifi_iface_stat));
-    } else {
-        memset(&link_stat, 0, sizeof(wifi_iface_stat));
-    }
-
-    if (num_radios > 0 && radio_stats != 0) {
-        memcpy(&radio_stat, radio_stats, sizeof(wifi_radio_stat));
-        if (isTxLevelStatsPresent(radio_stats)) {
-            // This realloc should be a no-op after the first allocation because for a given
-            // device, the number of power levels should not change.
-            u32 arr_size = sizeof(u32) * radio_stats->num_tx_levels;
-            tx_time_per_level_arr = (u32 *)realloc(tx_time_per_level_arr, arr_size);
-            memcpy(tx_time_per_level_arr, radio_stats->tx_time_per_levels, arr_size);
-            radio_stat.tx_time_per_levels = tx_time_per_level_arr;
-        } else {
-            radio_stat.num_tx_levels = 0;
-            radio_stat.tx_time_per_levels = 0;
-        }
-    } else {
-        memset(&radio_stat, 0, sizeof(wifi_radio_stat));
-    }
-}
-
-static void android_net_wifi_setLinkLayerStats (JNIEnv *env, jclass cls, jint iface, int enable)  {
-    JNIHelper helper(env);
-    wifi_interface_handle handle = getIfaceHandle(helper, cls, iface);
-
-    wifi_link_layer_params params;
-    params.aggressive_statistics_gathering = enable;
-    params.mpdu_size_threshold = 128;
-
-    ALOGD("android_net_wifi_setLinkLayerStats: %u\n", enable);
-
-    hal_fn.wifi_set_link_stats(handle, params);
-}
-
-static jobject android_net_wifi_getLinkLayerStats (JNIEnv *env, jclass cls, jint iface)  {
-
-    JNIHelper helper(env);
-    wifi_stats_result_handler handler;
-    memset(&handler, 0, sizeof(handler));
-    handler.on_link_stats_results = &onLinkStatsResults;
-    wifi_interface_handle handle = getIfaceHandle(helper, cls, iface);
-    int result;
-    // Cache the features supported by the device to determine if tx level stats are present or not
-    if (cached_feature_set == 0) {
-        result = hal_fn.wifi_get_supported_feature_set(handle, &cached_feature_set);
-        if (result != WIFI_SUCCESS) {
-            cached_feature_set = 0;
-        }
-    }
-
-    result = hal_fn.wifi_get_link_stats(0, handle, handler);
-    if (result < 0) {
-        ALOGE("android_net_wifi_getLinkLayerStats: failed to get link statistics\n");
-        return NULL;
-    }
-
-    JNIObject<jobject> wifiLinkLayerStats = helper.createObject(
-            "android/net/wifi/WifiLinkLayerStats");
-    if (wifiLinkLayerStats == NULL) {
-       ALOGE("Error in allocating wifiLinkLayerStats");
-       return NULL;
-    }
-
-    JNIObject<jintArray> tx_time_per_level = helper.newIntArray(radio_stat.num_tx_levels);
-    if (tx_time_per_level == NULL) {
-        ALOGE("Error in allocating wifiLinkLayerStats");
-        return NULL;
-    }
-
-    helper.setIntField(wifiLinkLayerStats, "beacon_rx", link_stat.beacon_rx);
-    helper.setIntField(wifiLinkLayerStats, "rssi_mgmt", link_stat.rssi_mgmt);
-    helper.setLongField(wifiLinkLayerStats, "rxmpdu_be", link_stat.ac[WIFI_AC_BE].rx_mpdu);
-    helper.setLongField(wifiLinkLayerStats, "rxmpdu_bk", link_stat.ac[WIFI_AC_BK].rx_mpdu);
-    helper.setLongField(wifiLinkLayerStats, "rxmpdu_vi", link_stat.ac[WIFI_AC_VI].rx_mpdu);
-    helper.setLongField(wifiLinkLayerStats, "rxmpdu_vo", link_stat.ac[WIFI_AC_VO].rx_mpdu);
-    helper.setLongField(wifiLinkLayerStats, "txmpdu_be", link_stat.ac[WIFI_AC_BE].tx_mpdu);
-    helper.setLongField(wifiLinkLayerStats, "txmpdu_bk", link_stat.ac[WIFI_AC_BK].tx_mpdu);
-    helper.setLongField(wifiLinkLayerStats, "txmpdu_vi", link_stat.ac[WIFI_AC_VI].tx_mpdu);
-    helper.setLongField(wifiLinkLayerStats, "txmpdu_vo", link_stat.ac[WIFI_AC_VO].tx_mpdu);
-    helper.setLongField(wifiLinkLayerStats, "lostmpdu_be", link_stat.ac[WIFI_AC_BE].mpdu_lost);
-    helper.setLongField(wifiLinkLayerStats, "lostmpdu_bk", link_stat.ac[WIFI_AC_BK].mpdu_lost);
-    helper.setLongField(wifiLinkLayerStats, "lostmpdu_vi",  link_stat.ac[WIFI_AC_VI].mpdu_lost);
-    helper.setLongField(wifiLinkLayerStats, "lostmpdu_vo", link_stat.ac[WIFI_AC_VO].mpdu_lost);
-    helper.setLongField(wifiLinkLayerStats, "retries_be", link_stat.ac[WIFI_AC_BE].retries);
-    helper.setLongField(wifiLinkLayerStats, "retries_bk", link_stat.ac[WIFI_AC_BK].retries);
-    helper.setLongField(wifiLinkLayerStats, "retries_vi", link_stat.ac[WIFI_AC_VI].retries);
-    helper.setLongField(wifiLinkLayerStats, "retries_vo", link_stat.ac[WIFI_AC_VO].retries);
-
-    helper.setIntField(wifiLinkLayerStats, "on_time", radio_stat.on_time);
-    helper.setIntField(wifiLinkLayerStats, "tx_time", radio_stat.tx_time);
-    helper.setIntField(wifiLinkLayerStats, "rx_time", radio_stat.rx_time);
-    helper.setIntField(wifiLinkLayerStats, "on_time_scan", radio_stat.on_time_scan);
-    if (radio_stat.tx_time_per_levels != 0) {
-        helper.setIntArrayRegion(tx_time_per_level, 0, radio_stat.num_tx_levels,
-                (jint *)radio_stat.tx_time_per_levels);
-    }
-    helper.setObjectField(wifiLinkLayerStats, "tx_time_per_level", "[I", tx_time_per_level);
-
-
-    return wifiLinkLayerStats.detach();
-}
-
-static jint android_net_wifi_getSupportedFeatures(JNIEnv *env, jclass cls, jint iface) {
-
-    JNIHelper helper(env);
-    wifi_interface_handle handle = getIfaceHandle(helper, cls, iface);
-    feature_set set = 0;
-
-    wifi_error result = WIFI_SUCCESS;
-    /*
-    set = WIFI_FEATURE_INFRA
-        | WIFI_FEATURE_INFRA_5G
-        | WIFI_FEATURE_HOTSPOT
-        | WIFI_FEATURE_P2P
-        | WIFI_FEATURE_SOFT_AP
-        | WIFI_FEATURE_GSCAN
-        | WIFI_FEATURE_PNO
-        | WIFI_FEATURE_TDLS
-        | WIFI_FEATURE_EPR;
-    */
-
-    result = hal_fn.wifi_get_supported_feature_set(handle, &set);
-    if (result == WIFI_SUCCESS) {
-        // ALOGD("wifi_get_supported_feature_set returned set = 0x%x", set);
-        return set;
-    } else {
-        ALOGE("wifi_get_supported_feature_set returned error = 0x%x", result);
-        return 0;
-    }
-}
-
-static void onRttResults(wifi_request_id id, unsigned num_results, wifi_rtt_result* results[]) {
-
-    JNIHelper helper(mVM);
-
-    if (DBG) ALOGD("onRttResults called, vm = %p, obj = %p", mVM, mCls);
-
-    JNIObject<jobjectArray> rttResults = helper.newObjectArray(
-            num_results, "android/net/wifi/RttManager$RttResult", NULL);
-    if (rttResults == NULL) {
-        ALOGE("Error in allocating RttResult array in onRttResults, length=%d", num_results);
-        return;
-    }
-
-    for (unsigned i = 0; i < num_results; i++) {
-
-        wifi_rtt_result *result = results[i];
-
-        JNIObject<jobject> rttResult = helper.createObject("android/net/wifi/RttManager$RttResult");
-        if (rttResult == NULL) {
-            ALOGE("Error in creating rtt result in onRttResults");
-            return;
-        }
-
-        char bssid[32];
-        snprintf(bssid, sizeof(bssid), "%02x:%02x:%02x:%02x:%02x:%02x",
-                 result->addr[0], result->addr[1], result->addr[2],
-                 result->addr[3], result->addr[4], result->addr[5]);
-
-        helper.setStringField(rttResult, "bssid", bssid);
-        helper.setIntField( rttResult, "burstNumber",              result->burst_num);
-        helper.setIntField( rttResult, "measurementFrameNumber",   result->measurement_number);
-        helper.setIntField( rttResult, "successMeasurementFrameNumber",   result->success_number);
-        helper.setIntField(rttResult, "frameNumberPerBurstPeer",   result->number_per_burst_peer);
-        helper.setIntField( rttResult, "status",                   result->status);
-        helper.setIntField( rttResult, "measurementType",          result->type);
-        helper.setIntField(rttResult, "retryAfterDuration",       result->retry_after_duration);
-        helper.setLongField(rttResult, "ts",                       result->ts);
-        helper.setIntField( rttResult, "rssi",                     result->rssi);
-        helper.setIntField( rttResult, "rssiSpread",               result->rssi_spread);
-        helper.setIntField( rttResult, "txRate",                   result->tx_rate.bitrate);
-        helper.setIntField( rttResult, "rxRate",                   result->rx_rate.bitrate);
-        helper.setLongField(rttResult, "rtt",                      result->rtt);
-        helper.setLongField(rttResult, "rttStandardDeviation",     result->rtt_sd);
-        helper.setIntField( rttResult, "distance",                 result->distance_mm / 10);
-        helper.setIntField( rttResult, "distanceStandardDeviation", result->distance_sd_mm / 10);
-        helper.setIntField( rttResult, "distanceSpread",           result->distance_spread_mm / 10);
-        helper.setIntField( rttResult, "burstDuration",             result->burst_duration);
-        helper.setIntField( rttResult, "negotiatedBurstNum",      result->negotiated_burst_num);
-
-        JNIObject<jobject> LCI = helper.createObject(
-                "android/net/wifi/RttManager$WifiInformationElement");
-        if (result->LCI != NULL && result->LCI->len > 0) {
-            helper.setByteField(LCI, "id", result->LCI->id);
-            JNIObject<jbyteArray> elements = helper.newByteArray(result->LCI->len);
-            jbyte *bytes = (jbyte *)&(result->LCI->data[0]);
-            helper.setByteArrayRegion(elements, 0, result->LCI->len, bytes);
-            helper.setObjectField(LCI, "data", "[B", elements);
-        } else {
-            helper.setByteField(LCI, "id", (byte)(0xff));
-        }
-        helper.setObjectField(rttResult, "LCI",
-            "Landroid/net/wifi/RttManager$WifiInformationElement;", LCI);
-
-        JNIObject<jobject> LCR = helper.createObject(
-                "android/net/wifi/RttManager$WifiInformationElement");
-        if (result->LCR != NULL && result->LCR->len > 0) {
-            helper.setByteField(LCR, "id",           result->LCR->id);
-            JNIObject<jbyteArray> elements = helper.newByteArray(result->LCI->len);
-            jbyte *bytes = (jbyte *)&(result->LCR->data[0]);
-            helper.setByteArrayRegion(elements, 0, result->LCI->len, bytes);
-            helper.setObjectField(LCR, "data", "[B", elements);
-        } else {
-            helper.setByteField(LCR, "id", (byte)(0xff));
-        }
-        helper.setObjectField(rttResult, "LCR",
-            "Landroid/net/wifi/RttManager$WifiInformationElement;", LCR);
-
-        helper.setObjectArrayElement(rttResults, i, rttResult);
-    }
-
-    helper.reportEvent(mCls, "onRttResults", "(I[Landroid/net/wifi/RttManager$RttResult;)V",
-        id, rttResults.get());
-}
-
-const int MaxRttConfigs = 16;
-
-static jboolean android_net_wifi_requestRange(
-        JNIEnv *env, jclass cls, jint iface, jint id, jobject params)  {
-
-    JNIHelper helper(env);
-
-    wifi_interface_handle handle = getIfaceHandle(helper, cls, iface);
-    if (DBG) ALOGD("sending rtt request [%d] = %p", id, handle);
-    if (params == NULL) {
-        ALOGE("ranging params are empty");
-        return false;
-    }
-
-    wifi_rtt_config configs[MaxRttConfigs];
-    memset(&configs, 0, sizeof(configs));
-
-    int len = helper.getArrayLength((jobjectArray)params);
-    if (len > MaxRttConfigs) {
-        return false;
-    }
-
-    for (int i = 0; i < len; i++) {
-
-        JNIObject<jobject> param = helper.getObjectArrayElement((jobjectArray)params, i);
-        if (param == NULL) {
-            ALOGW("could not get element %d", i);
-            continue;
-        }
-
-        wifi_rtt_config &config = configs[i];
-
-        parseMacAddress(env, param, config.addr);
-        config.type = (wifi_rtt_type)helper.getIntField(param, "requestType");
-        config.peer = (rtt_peer_type)helper.getIntField(param, "deviceType");
-        config.channel.center_freq = helper.getIntField(param, "frequency");
-        config.channel.width = (wifi_channel_width) helper.getIntField(param, "channelWidth");
-        config.channel.center_freq0 = helper.getIntField(param, "centerFreq0");
-        config.channel.center_freq1 = helper.getIntField(param, "centerFreq1");
-
-        config.num_burst = helper.getIntField(param, "numberBurst");
-        config.burst_period = (unsigned) helper.getIntField(param, "interval");
-        config.num_frames_per_burst = (unsigned) helper.getIntField(param, "numSamplesPerBurst");
-        config.num_retries_per_rtt_frame = (unsigned) helper.getIntField(param,
-                "numRetriesPerMeasurementFrame");
-        config.num_retries_per_ftmr = (unsigned) helper.getIntField(param, "numRetriesPerFTMR");
-        config.LCI_request = helper.getBoolField(param, "LCIRequest") ? 1 : 0;
-        config.LCR_request = helper.getBoolField(param, "LCRRequest") ? 1 : 0;
-        config.burst_duration = (unsigned) helper.getIntField(param, "burstTimeout");
-        config.preamble = (wifi_rtt_preamble) helper.getIntField(param, "preamble");
-        config.bw = (wifi_rtt_bw) helper.getIntField(param, "bandwidth");
-    }
-
-    wifi_rtt_event_handler handler;
-    handler.on_rtt_results = &onRttResults;
-
-    return hal_fn.wifi_rtt_range_request(id, handle, len, configs, handler) == WIFI_SUCCESS;
-}
-
-static jboolean android_net_wifi_cancelRange(
-        JNIEnv *env, jclass cls, jint iface, jint id, jobject params)  {
-
-    JNIHelper helper(env);
-    wifi_interface_handle handle = getIfaceHandle(helper, cls, iface);
-    if (DBG) ALOGD("cancelling rtt request [%d] = %p", id, handle);
-
-    if (params == NULL) {
-        ALOGE("ranging params are empty");
-        return false;
-    }
-
-    mac_addr addrs[MaxRttConfigs];
-    memset(&addrs, 0, sizeof(addrs));
-
-    int len = helper.getArrayLength((jobjectArray)params);
-    if (len > MaxRttConfigs) {
-        return false;
-    }
-
-    for (int i = 0; i < len; i++) {
-
-        JNIObject<jobject> param = helper.getObjectArrayElement(params, i);
-        if (param == NULL) {
-            ALOGW("could not get element %d", i);
-            continue;
-        }
-
-        parseMacAddress(env, param, addrs[i]);
-    }
-
-    return hal_fn.wifi_rtt_range_cancel(id, handle, len, addrs) == WIFI_SUCCESS;
-}
-
-static jobject android_net_wifi_enableResponder(
-        JNIEnv *env, jclass cls, jint iface, jint id, jint timeout_seconds, jobject channel_hint) {
-    JNIHelper helper(env);
-    wifi_interface_handle handle = getIfaceHandle(helper, cls, iface);
-    if (DBG) ALOGD("enabling responder request [%d] = %p", id, handle);
-    wifi_channel_info channel;
-    // Get channel information from HAL if it's not provided by caller.
-    if (channel_hint == NULL) {
-        wifi_rtt_responder responder_info_hint;
-        bool status = hal_fn.wifi_rtt_get_responder_info(handle, &responder_info_hint);
-        if (status != WIFI_SUCCESS) {
-            ALOGE("could not get available channel for responder");
-            return NULL;
-        }
-        channel = responder_info_hint.channel;
-    } else {
-        channel.center_freq = helper.getIntField(channel_hint, "mPrimaryFrequency");
-        channel.center_freq0 = helper.getIntField(channel_hint, "mCenterFrequency0");
-        channel.center_freq1 = helper.getIntField(channel_hint, "mCenterFrequency1");
-        channel.width = (wifi_channel_width)helper.getIntField(channel_hint, "mChannelWidth");
-    }
-
-    if (DBG) {
-        ALOGD("wifi_channel_width: %d, center_freq: %d, center_freq0: %d",
-              channel.width, channel.center_freq, channel.center_freq0);
-    }
-
-    wifi_rtt_responder responder_info_used;
-    bool status = hal_fn.wifi_enable_responder(id, handle, channel, timeout_seconds,
-            &responder_info_used);
-    if (status != WIFI_SUCCESS) {
-        ALOGE("enabling responder mode failed");
-        return NULL;
-    }
-    wifi_channel_info channel_used = responder_info_used.channel;
-    if (DBG) {
-        ALOGD("wifi_channel_width: %d, center_freq: %d, center_freq0: %d",
-              channel_used.width, channel_used.center_freq, channel_used.center_freq0);
-    }
-    JNIObject<jobject> responderConfig =
-        helper.createObject("android/net/wifi/RttManager$ResponderConfig");
-    if (responderConfig == NULL) return NULL;
-    helper.setIntField(responderConfig, "frequency", channel_used.center_freq);
-    helper.setIntField(responderConfig, "centerFreq0", channel_used.center_freq0);
-    helper.setIntField(responderConfig, "centerFreq1", channel_used.center_freq1);
-    helper.setIntField(responderConfig, "channelWidth", channel_used.width);
-    helper.setIntField(responderConfig, "preamble", responder_info_used.preamble);
-    return responderConfig.detach();
-}
-
-static jboolean android_net_wifi_disableResponder(
-        JNIEnv *env, jclass cls, jint iface, jint id)  {
-    JNIHelper helper(env);
-    wifi_interface_handle handle = getIfaceHandle(helper, cls, iface);
-    if (DBG) ALOGD("disabling responder request [%d] = %p", id, handle);
-    return hal_fn.wifi_disable_responder(id, handle) == WIFI_SUCCESS;
-}
-
-
-static jboolean android_net_wifi_setScanningMacOui(JNIEnv *env, jclass cls,
-        jint iface, jbyteArray param)  {
-
-    JNIHelper helper(env);
-    wifi_interface_handle handle = getIfaceHandle(helper, cls, iface);
-    ALOGD("setting scan oui %p", handle);
-
-    static const unsigned oui_len = 3;          /* OUI is upper 3 bytes of mac_address */
-    int len = helper.getArrayLength(param);
-    if (len != oui_len) {
-        ALOGE("invalid oui length %d", len);
-        return false;
-    }
-
-    ScopedBytesRW paramBytes(env, param);
-    jbyte* bytes = paramBytes.get();
-    if (bytes == NULL) {
-        ALOGE("failed to get setScanningMacOui param array");
-        return false;
-    }
-
-    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){
-    HalTool hal_tool;
-    return hal_tool.CanGetValidChannels(&hal_fn);
-}
-
-static jintArray android_net_wifi_getValidChannels(JNIEnv *env, jclass cls,
-        jint iface, jint band)  {
-
-    JNIHelper helper(env);
-    wifi_interface_handle handle = getIfaceHandle(helper, cls, iface);
-    ALOGV("getting valid channels %p", handle);
-
-    static const int MaxChannels = 64;
-    wifi_channel channels[64];
-    int num_channels = 0;
-    wifi_error result = hal_fn.wifi_get_valid_channels(handle, band, MaxChannels,
-            channels, &num_channels);
-
-    if (result == WIFI_SUCCESS) {
-        JNIObject<jintArray> channelArray = helper.newIntArray(num_channels);
-        if (channelArray == NULL) {
-            ALOGE("failed to allocate channel list, num_channels=%d", num_channels);
-            return NULL;
-        }
-
-        helper.setIntArrayRegion(channelArray, 0, num_channels, channels);
-        return channelArray.detach();
-    } else {
-        ALOGE("failed to get channel list : %d", result);
-        return NULL;
-    }
-}
-
-static jboolean android_net_wifi_setDfsFlag(JNIEnv *env, jclass cls, jint iface, jboolean dfs) {
-
-    JNIHelper helper(env);
-    wifi_interface_handle handle = getIfaceHandle(helper, cls, iface);
-    ALOGD("setting dfs flag to %s, %p", dfs ? "true" : "false", handle);
-
-    u32 nodfs = dfs ? 0 : 1;
-    wifi_error result = hal_fn.wifi_set_nodfs_flag(handle, nodfs);
-    return result == WIFI_SUCCESS;
-}
-
-static jobject android_net_wifi_get_rtt_capabilities(JNIEnv *env, jclass cls, jint iface) {
-
-    JNIHelper helper(env);
-    wifi_rtt_capabilities rtt_capabilities;
-    wifi_interface_handle handle = getIfaceHandle(helper, cls, iface);
-    wifi_error ret = hal_fn.wifi_get_rtt_capabilities(handle, &rtt_capabilities);
-
-    if(WIFI_SUCCESS == ret) {
-         JNIObject<jobject> capabilities = helper.createObject(
-                "android/net/wifi/RttManager$RttCapabilities");
-         helper.setBooleanField(capabilities, "oneSidedRttSupported",
-                 rtt_capabilities.rtt_one_sided_supported == 1);
-         helper.setBooleanField(capabilities, "twoSided11McRttSupported",
-                 rtt_capabilities.rtt_ftm_supported == 1);
-         helper.setBooleanField(capabilities, "lciSupported",
-                 rtt_capabilities.lci_support);
-         helper.setBooleanField(capabilities, "lcrSupported",
-                 rtt_capabilities.lcr_support);
-         helper.setIntField(capabilities, "preambleSupported",
-                 rtt_capabilities.preamble_support);
-         helper.setIntField(capabilities, "bwSupported",
-                 rtt_capabilities.bw_support);
-         helper.setBooleanField(capabilities, "responderSupported",
-                 rtt_capabilities.responder_supported == 1);
-         if (DBG) {
-             ALOGD("One side RTT is %s", rtt_capabilities.rtt_one_sided_supported == 1 ?
-                "supported" : "not supported");
-             ALOGD("Two side RTT is %s", rtt_capabilities.rtt_ftm_supported == 1 ?
-                "supported" : "not supported");
-             ALOGD("LCR is %s", rtt_capabilities.lcr_support == 1 ? "supported" : "not supported");
-             ALOGD("LCI is %s", rtt_capabilities.lci_support == 1 ? "supported" : "not supported");
-             ALOGD("Supported preamble is %d", rtt_capabilities.preamble_support);
-             ALOGD("Supported bandwidth is %d", rtt_capabilities.bw_support);
-             ALOGD("Sta responder is %s",
-                 rtt_capabilities.responder_supported == 1 ? "supported" : "not supported");
-         }
-         return capabilities.detach();
-    } else {
-        return NULL;
-    }
-}
-
-static jobject android_net_wifi_get_apf_capabilities(JNIEnv *env, jclass cls,
-        jint iface) {
-
-    JNIHelper helper(env);
-    u32 version = 0, max_len = 0;
-    wifi_interface_handle handle = getIfaceHandle(helper, cls, iface);
-    wifi_error ret = hal_fn.wifi_get_packet_filter_capabilities(handle, &version, &max_len);
-
-    if (WIFI_SUCCESS == ret) {
-        // Cannot just use createObject() because members are final and initializer values must be
-        // passed via ApfCapabilities().
-        JNIObject<jclass> apf_cls(helper, env->FindClass("android/net/apf/ApfCapabilities"));
-        if (apf_cls == NULL) {
-            ALOGE("Error in finding class android/net/apf/ApfCapabilities");
-            return NULL;
-        }
-        jmethodID constructor = env->GetMethodID(apf_cls, "<init>", "(III)V");
-        if (constructor == 0) {
-            ALOGE("Error in constructor ID for android/net/apf/ApfCapabilities");
-            return NULL;
-        }
-        JNIObject<jobject> capabilities(helper, env->NewObject(apf_cls, constructor, version,
-                max_len, ARPHRD_ETHER));
-        if (capabilities == NULL) {
-            ALOGE("Could not create new object of android/net/apf/ApfCapabilities");
-            return NULL;
-        }
-        ALOGD("APF version supported: %d", version);
-        ALOGD("Maximum APF program size: %d", max_len);
-        return capabilities.detach();
-    } else {
-        return NULL;
-    }
-}
-
-static jboolean android_net_wifi_install_packet_filter(JNIEnv *env, jclass cls, jint iface,
-        jbyteArray jfilter) {
-
-    JNIHelper helper(env);
-    const u8* filter = (uint8_t*)env->GetByteArrayElements(jfilter, NULL);
-    const u32 filter_len = env->GetArrayLength(jfilter);
-    wifi_interface_handle handle = getIfaceHandle(helper, cls, iface);
-    wifi_error ret = hal_fn.wifi_set_packet_filter(handle, filter, filter_len);
-    env->ReleaseByteArrayElements(jfilter, (jbyte*)filter, JNI_ABORT);
-    return WIFI_SUCCESS == ret;
-}
-
-static jboolean android_net_wifi_set_Country_Code_Hal(JNIEnv *env,jclass cls, jint iface,
-        jstring country_code) {
-
-    JNIHelper helper(env);
-    wifi_interface_handle handle = getIfaceHandle(helper, cls, iface);
-
-    ScopedUtfChars chars(env, country_code);
-    const char *country = chars.c_str();
-
-    ALOGD("set country code: %s", country);
-    wifi_error res = hal_fn.wifi_set_country_code(handle, country);
-    return res == WIFI_SUCCESS;
-}
-
-static jboolean android_net_wifi_enable_disable_tdls(JNIEnv *env,jclass cls, jint iface,
-        jboolean enable, jstring addr) {
-
-    JNIHelper helper(env);
-    wifi_interface_handle handle = getIfaceHandle(helper, cls, iface);
-
-    mac_addr address;
-    parseMacAddress(env, addr, address);
-    wifi_tdls_handler tdls_handler;
-    //tdls_handler.on_tdls_state_changed = &on_tdls_state_changed;
-
-    if(enable) {
-        return (hal_fn.wifi_enable_tdls(handle, address, NULL, tdls_handler) == WIFI_SUCCESS);
-    } else {
-        return (hal_fn.wifi_disable_tdls(handle, address) == WIFI_SUCCESS);
-    }
-}
-
-static void on_tdls_state_changed(mac_addr addr, wifi_tdls_status status) {
-
-    JNIHelper helper(mVM);
-
-    ALOGD("on_tdls_state_changed is called: vm = %p, obj = %p", mVM, mCls);
-
-    char mac[32];
-    snprintf(mac, sizeof(mac), "%02x:%02x:%02x:%02x:%02x:%02x", addr[0],
-             addr[1], addr[2], addr[3], addr[4], addr[5]);
-
-    JNIObject<jstring> mac_address = helper.newStringUTF(mac);
-    helper.reportEvent(mCls, "onTdlsStatus", "(Ljava/lang/StringII;)V",
-        mac_address.get(), status.state, status.reason);
-
-}
-
-static jobject android_net_wifi_get_tdls_status(JNIEnv *env,jclass cls, jint iface,jstring addr) {
-
-    JNIHelper helper(env);
-    wifi_interface_handle handle = getIfaceHandle(helper, cls, iface);
-
-    mac_addr address;
-    parseMacAddress(env, addr, address);
-
-    wifi_tdls_status status;
-
-    wifi_error ret;
-    ret = hal_fn.wifi_get_tdls_status(handle, address, &status );
-
-    if (ret != WIFI_SUCCESS) {
-        return NULL;
-    } else {
-        JNIObject<jobject> tdls_status = helper.createObject(
-                "com/android/server/wifi/WifiNative$TdlsStatus");
-        helper.setIntField(tdls_status, "channel", status.channel);
-        helper.setIntField(tdls_status, "global_operating_class", status.global_operating_class);
-        helper.setIntField(tdls_status, "state", status.state);
-        helper.setIntField(tdls_status, "reason", status.reason);
-        return tdls_status.detach();
-    }
-}
-
-static jobject android_net_wifi_get_tdls_capabilities(JNIEnv *env, jclass cls, jint iface) {
-
-    JNIHelper helper(env);
-    wifi_tdls_capabilities tdls_capabilities;
-    wifi_interface_handle handle = getIfaceHandle(helper, cls, iface);
-    wifi_error ret = hal_fn.wifi_get_tdls_capabilities(handle, &tdls_capabilities);
-
-    if (WIFI_SUCCESS == ret) {
-         JNIObject<jobject> capabilities = helper.createObject(
-                 "com/android/server/wifi/WifiNative$TdlsCapabilities");
-         helper.setIntField(capabilities, "maxConcurrentTdlsSessionNumber",
-                 tdls_capabilities.max_concurrent_tdls_session_num);
-         helper.setBooleanField(capabilities, "isGlobalTdlsSupported",
-                 tdls_capabilities.is_global_tdls_supported == 1);
-         helper.setBooleanField(capabilities, "isPerMacTdlsSupported",
-                 tdls_capabilities.is_per_mac_tdls_supported == 1);
-         helper.setBooleanField(capabilities, "isOffChannelTdlsSupported",
-                 tdls_capabilities.is_off_channel_tdls_supported);
-
-         ALOGD("TDLS Max Concurrent Tdls Session Number is: %d",
-                 tdls_capabilities.max_concurrent_tdls_session_num);
-         ALOGD("Global Tdls is: %s", tdls_capabilities.is_global_tdls_supported == 1 ? "support" :
-                 "not support");
-         ALOGD("Per Mac Tdls is: %s", tdls_capabilities.is_per_mac_tdls_supported == 1 ? "support" :
-                 "not support");
-         ALOGD("Off Channel Tdls is: %s", tdls_capabilities.is_off_channel_tdls_supported == 1 ?
-                 "support" : "not support");
-
-         return capabilities.detach();
-    } else {
-        return NULL;
-    }
-}
-
-// ----------------------------------------------------------------------------
-// Debug framework
-// ----------------------------------------------------------------------------
-static jint android_net_wifi_get_supported_logger_feature(JNIEnv *env, jclass cls, jint iface){
-    //Not implemented yet
-    return -1;
-}
-
-static jobject android_net_wifi_get_driver_version(JNIEnv *env, jclass cls, jint iface) {
-     //Need to be fixed. The memory should be allocated from lower layer
-    //char *buffer = NULL;
-    JNIHelper helper(env);
-    int buffer_length =  256;
-    char *buffer = (char *)malloc(buffer_length);
-    if (!buffer) return NULL;
-    memset(buffer, 0, buffer_length);
-    wifi_interface_handle handle = getIfaceHandle(helper, cls, iface);
-
-    ALOGD("android_net_wifi_get_driver_version = %p", handle);
-
-    if (handle == 0) {
-        free(buffer);
-        return NULL;
-    }
-
-    wifi_error result = hal_fn.wifi_get_driver_version(handle, buffer, buffer_length);
-
-    if (result == WIFI_SUCCESS) {
-        ALOGD("buffer is %p, length is %d", buffer, buffer_length);
-        JNIObject<jstring> driver_version = helper.newStringUTF(buffer);
-        free(buffer);
-        return driver_version.detach();
-    } else {
-        ALOGE("Fail to get driver version");
-        free(buffer);
-        return NULL;
-    }
-}
-
-static jobject android_net_wifi_get_firmware_version(JNIEnv *env, jclass cls, jint iface) {
-
-    //char *buffer = NULL;
-    JNIHelper helper(env);
-    int buffer_length = 256;
-    char *buffer = (char *)malloc(buffer_length);
-    if (!buffer) return NULL;
-    memset(buffer, 0, buffer_length);
-    wifi_interface_handle handle = getIfaceHandle(helper, cls, iface);
-
-    ALOGD("android_net_wifi_get_firmware_version = %p", handle);
-
-    if (handle == 0) {
-        free(buffer);
-        return NULL;
-    }
-
-    wifi_error result = hal_fn.wifi_get_firmware_version(handle, buffer, buffer_length);
-
-    if (result == WIFI_SUCCESS) {
-        ALOGD("buffer is %p, length is %d", buffer, buffer_length);
-        JNIObject<jstring> firmware_version = helper.newStringUTF(buffer);
-        free(buffer);
-        return firmware_version.detach();
-    } else {
-        ALOGE("Fail to get Firmware version");
-        free(buffer);
-        return NULL;
-    }
-}
-
-static jobject android_net_wifi_get_ring_buffer_status (JNIEnv *env, jclass cls, jint iface) {
-
-    JNIHelper helper(env);
-    wifi_interface_handle handle = getIfaceHandle(helper, cls, iface);
-
-    ALOGD("android_net_wifi_get_ring_buffer_status = %p", handle);
-
-    if (handle == 0) {
-        return NULL;
-    }
-
-    //wifi_ring_buffer_status *status = NULL;
-    u32 num_rings = 10;
-    wifi_ring_buffer_status *status =
-        (wifi_ring_buffer_status *)malloc(sizeof(wifi_ring_buffer_status) * num_rings);
-    if (!status) return NULL;
-    memset(status, 0, sizeof(wifi_ring_buffer_status) * num_rings);
-    wifi_error result = hal_fn.wifi_get_ring_buffers_status(handle, &num_rings, status);
-    if (result == WIFI_SUCCESS) {
-        ALOGD("status is %p, number is %d", status, num_rings);
-
-        JNIObject<jobjectArray> ringBuffersStatus = helper.newObjectArray(
-            num_rings, "com/android/server/wifi/WifiNative$RingBufferStatus", NULL);
-
-        wifi_ring_buffer_status *tmp = status;
-
-        for(u32 i = 0; i < num_rings; i++, tmp++) {
-
-            JNIObject<jobject> ringStatus = helper.createObject(
-                    "com/android/server/wifi/WifiNative$RingBufferStatus");
-
-            if (ringStatus == NULL) {
-                ALOGE("Error in creating ringBufferStatus");
-                free(status);
-                return NULL;
-            }
-
-            char name[32];
-            for(int j = 0; j < 32; j++) {
-                name[j] = tmp->name[j];
-            }
-
-            helper.setStringField(ringStatus, "name", name);
-            helper.setIntField(ringStatus, "flag", tmp->flags);
-            helper.setIntField(ringStatus, "ringBufferId", tmp->ring_id);
-            helper.setIntField(ringStatus, "ringBufferByteSize", tmp->ring_buffer_byte_size);
-            helper.setIntField(ringStatus, "verboseLevel", tmp->verbose_level);
-            helper.setIntField(ringStatus, "writtenBytes", tmp->written_bytes);
-            helper.setIntField(ringStatus, "readBytes", tmp->read_bytes);
-            helper.setIntField(ringStatus, "writtenRecords", tmp->written_records);
-
-            helper.setObjectArrayElement(ringBuffersStatus, i, ringStatus);
-        }
-
-        free(status);
-        return ringBuffersStatus.detach();
-    } else {
-        free(status);
-        return NULL;
-    }
-}
-
-static void on_ring_buffer_data(char *ring_name, char *buffer, int buffer_size,
-        wifi_ring_buffer_status *status) {
-
-    if (!ring_name || !buffer || !status ||
-            (unsigned int)buffer_size <= sizeof(wifi_ring_buffer_entry)) {
-        ALOGE("Error input for on_ring_buffer_data!");
-        return;
-    }
-
-
-    JNIHelper helper(mVM);
-    /* ALOGD("on_ring_buffer_data called, vm = %p, obj = %p, env = %p buffer size = %d", mVM,
-            mCls, env, buffer_size); */
-
-    JNIObject<jobject> ringStatus = helper.createObject(
-                    "com/android/server/wifi/WifiNative$RingBufferStatus");
-    if (status == NULL) {
-        ALOGE("Error in creating ringBufferStatus");
-        return;
-    }
-
-    helper.setStringField(ringStatus, "name", ring_name);
-    helper.setIntField(ringStatus, "flag", status->flags);
-    helper.setIntField(ringStatus, "ringBufferId", status->ring_id);
-    helper.setIntField(ringStatus, "ringBufferByteSize", status->ring_buffer_byte_size);
-    helper.setIntField(ringStatus, "verboseLevel", status->verbose_level);
-    helper.setIntField(ringStatus, "writtenBytes", status->written_bytes);
-    helper.setIntField(ringStatus, "readBytes", status->read_bytes);
-    helper.setIntField(ringStatus, "writtenRecords", status->written_records);
-
-    JNIObject<jbyteArray> bytes = helper.newByteArray(buffer_size);
-    helper.setByteArrayRegion(bytes, 0, buffer_size, (jbyte*)buffer);
-
-    helper.reportEvent(mCls,"onRingBufferData",
-            "(Lcom/android/server/wifi/WifiNative$RingBufferStatus;[B)V",
-            ringStatus.get(), bytes.get());
-}
-
-static void on_alert_data(wifi_request_id id, char *buffer, int buffer_size, int err_code){
-
-    JNIHelper helper(mVM);
-    ALOGD("on_alert_data called, vm = %p, obj = %p, buffer_size = %d, error code = %d"
-            , mVM, mCls, buffer_size, err_code);
-
-    if (buffer_size > 0) {
-        JNIObject<jbyteArray> records = helper.newByteArray(buffer_size);
-        jbyte *bytes = (jbyte *) buffer;
-        helper.setByteArrayRegion(records, 0,buffer_size, bytes);
-        helper.reportEvent(mCls,"onWifiAlert","([BI)V", records.get(), err_code);
-    } else {
-        helper.reportEvent(mCls,"onWifiAlert","([BI)V", NULL, err_code);
-    }
-}
-
-
-static jboolean android_net_wifi_start_logging_ring_buffer(JNIEnv *env, jclass cls, jint iface,
-        jint verbose_level,jint flags, jint max_interval,jint min_data_size, jstring ring_name) {
-
-    JNIHelper helper(env);
-    wifi_interface_handle handle = getIfaceHandle(helper, cls, iface);
-
-    ALOGD("android_net_wifi_start_logging_ring_buffer = %p", handle);
-
-    if (handle == 0) {
-        return false;
-    }
-
-    ScopedUtfChars chars(env, ring_name);
-    const char* ring_name_const_char = chars.c_str();
-    int ret = hal_fn.wifi_start_logging(handle, verbose_level,
-            flags, max_interval, min_data_size, const_cast<char *>(ring_name_const_char));
-
-    if (ret != WIFI_SUCCESS) {
-        ALOGE("Fail to start logging for ring %s", ring_name_const_char);
-    } else {
-        ALOGD("start logging for ring %s", ring_name_const_char);
-    }
-
-    return ret == WIFI_SUCCESS;
-}
-
-static jboolean android_net_wifi_get_ring_buffer_data(JNIEnv *env, jclass cls, jint iface,
-        jstring ring_name) {
-
-    JNIHelper helper(env);
-    wifi_interface_handle handle = getIfaceHandle(helper, cls, iface);
-    // ALOGD("android_net_wifi_get_ring_buffer_data = %p", handle);
-
-    ScopedUtfChars chars(env, ring_name);
-    const char* ring_name_const_char = chars.c_str();
-    int result = hal_fn.wifi_get_ring_data(handle, const_cast<char *>(ring_name_const_char));
-    return result == WIFI_SUCCESS;
-}
-
-
-static void on_firmware_memory_dump(char *buffer, int buffer_size) {
-
-    JNIHelper helper(mVM);
-    /* ALOGD("on_firmware_memory_dump called, vm = %p, obj = %p, env = %p buffer_size = %d"
-            , mVM, mCls, env, buffer_size); */
-
-    if (buffer_size > 0) {
-        JNIObject<jbyteArray> dump = helper.newByteArray(buffer_size);
-        jbyte *bytes = (jbyte *) (buffer);
-        helper.setByteArrayRegion(dump, 0, buffer_size, bytes);
-        helper.reportEvent(mCls,"onWifiFwMemoryAvailable","([B)V", dump.get());
-    }
-}
-
-static jboolean android_net_wifi_get_fw_memory_dump(JNIEnv *env, jclass cls, jint iface){
-
-    JNIHelper helper(env);
-    wifi_interface_handle handle = getIfaceHandle(helper, cls, iface);
-    // ALOGD("android_net_wifi_get_fw_memory_dump = %p", handle);
-
-    if (handle == NULL) {
-        ALOGE("Can not get wifi_interface_handle");
-        return false;
-    }
-
-    wifi_firmware_memory_dump_handler fw_dump_handle;
-    fw_dump_handle.on_firmware_memory_dump = on_firmware_memory_dump;
-    int result = hal_fn.wifi_get_firmware_memory_dump(handle, fw_dump_handle);
-    return result == WIFI_SUCCESS;
-
-}
-
-std::vector<jbyte>* driver_state_dump_buffer_for_callback = nullptr;
-
-static void on_driver_state_dump(char *buffer, int buffer_size);
-static wifi_driver_memory_dump_callbacks driver_state_dump_callbacks = {
-    on_driver_state_dump
-};
-
-static void on_driver_state_dump(char *buffer, int buffer_size) {
-
-    if (!driver_state_dump_buffer_for_callback) {
-        ALOGE("Unexpected call from HAL implementation, into %s", __func__);
-        return;
-    }
-
-    if (buffer_size > 0) {
-        driver_state_dump_buffer_for_callback->insert(
-            driver_state_dump_buffer_for_callback->end(), buffer, buffer + buffer_size);
-    }
-}
-
-// TODO(quiche): Add unit tests. b/28072392
-static jbyteArray android_net_wifi_get_driver_state_dump(JNIEnv *env, jclass cls, jint iface){
-
-    JNIHelper helper(env);
-    wifi_interface_handle interface_handle = getIfaceHandle(helper, cls, iface);
-
-    if (!interface_handle) {
-        return nullptr;
-    }
-
-    int result;
-    std::vector<jbyte> state_dump_buffer_local;
-    driver_state_dump_buffer_for_callback = &state_dump_buffer_local;
-    result = hal_fn.wifi_get_driver_memory_dump(interface_handle, driver_state_dump_callbacks);
-    driver_state_dump_buffer_for_callback = nullptr;
-
-    if (result != WIFI_SUCCESS) {
-        ALOGW("HAL's wifi_get_driver_memory_dump returned %d", result);
-        return nullptr;
-    }
-
-    if (state_dump_buffer_local.empty()) {
-        ALOGW("HAL's wifi_get_driver_memory_dump provided zero bytes");
-        return nullptr;
-    }
-
-    const size_t dump_size = state_dump_buffer_local.size();
-    JNIObject<jbyteArray> driver_dump_java = helper.newByteArray(dump_size);
-    if (!driver_dump_java)  {
-        ALOGW("Failed to allocate Java buffer for driver state dump");
-        return nullptr;
-    }
-
-    helper.setByteArrayRegion(driver_dump_java, 0, dump_size, state_dump_buffer_local.data());
-    return driver_dump_java.detach();
-}
-
-static jboolean android_net_wifi_set_log_handler(JNIEnv *env, jclass cls, jint iface, jint id) {
-
-    JNIHelper helper(env);
-    wifi_interface_handle handle = getIfaceHandle(helper, cls, iface);
-    ALOGD("android_net_wifi_set_log_handler = %p", handle);
-
-    //initialize the handler on first time
-    wifi_ring_buffer_data_handler handler;
-    handler.on_ring_buffer_data = &on_ring_buffer_data;
-    int result = hal_fn.wifi_set_log_handler(id, handle, handler);
-    if (result != WIFI_SUCCESS) {
-        ALOGE("Fail to set logging handler");
-        return false;
-    }
-
-    //set alter handler This will start alert too
-    wifi_alert_handler alert_handler;
-    alert_handler.on_alert = &on_alert_data;
-    result = hal_fn.wifi_set_alert_handler(id, handle, alert_handler);
-    if (result != WIFI_SUCCESS) {
-        ALOGE(" Fail to set alert handler");
-        return false;
-    }
-
-    return true;
-}
-
-static jboolean android_net_wifi_reset_log_handler(JNIEnv *env, jclass cls, jint iface, jint id) {
-
-    JNIHelper helper(env);
-    wifi_interface_handle handle = getIfaceHandle(helper, cls, iface);
-
-    //reset alter handler
-    ALOGD("android_net_wifi_reset_alert_handler = %p", handle);
-    int result = hal_fn.wifi_reset_alert_handler(id, handle);
-    if (result != WIFI_SUCCESS) {
-        ALOGE(" Fail to reset alert handler");
-        return false;
-    }
-
-    //reset log handler
-    ALOGD("android_net_wifi_reset_log_handler = %p", handle);
-    result = hal_fn.wifi_reset_log_handler(id, handle);
-    if (result != WIFI_SUCCESS) {
-        ALOGE("Fail to reset logging handler");
-        return false;
-    }
-
-    return true;
-}
-
-static jint android_net_wifi_start_pkt_fate_monitoring(JNIEnv *env, jclass cls, jint iface) {
-
-    JNIHelper helper(env);
-    return hal_fn.wifi_start_pkt_fate_monitoring(
-        getIfaceHandle(helper, cls, iface));
-}
-
-// Helper for make_default_fate().
-template<typename T> void set_to_max(T* value) {
-    if (!value) {
-        return;
-    }
-    *value = std::numeric_limits<T>::max();
-}
-
-// make_default_fate() has two purposes:
-// 1) Minimize the chances of data leakage. In case the HAL gives us an overlong long |frame_len|,
-//    for example, we want to return zeros, rather than other data from this process.
-// 2) Make it obvious when the HAL doesn't set a field. We accomplish this by setting fields
-//    to "impossible" values, where possible.
-// Normally, such work would be done in a ctor. However, doing so would make the HAL API
-// incompatible with C. So we use a free-standing function instead.
-//
-// TODO(quiche): Add unit test for this function. b/27726696
-template<typename FateReportT> FateReportT make_default_fate() {
-
-    FateReportT fate_report;
-    set_to_max(&fate_report.fate);
-    std::fill(std::begin(fate_report.md5_prefix), std::end(fate_report.md5_prefix), 0);
-    set_to_max(&fate_report.frame_inf.payload_type);
-    fate_report.frame_inf.frame_len = 0;
-    fate_report.frame_inf.driver_timestamp_usec = 0;
-    fate_report.frame_inf.firmware_timestamp_usec = 0;
-    std::fill(std::begin(fate_report.frame_inf.frame_content.ieee_80211_mgmt_bytes),
-        std::end(fate_report.frame_inf.frame_content.ieee_80211_mgmt_bytes), 0);
-    return fate_report;
-}
-
-// TODO(quiche): Add unit test for this function. b/27726696
-template<typename FateReportT, typename HalFateFetcherT> wifi_error get_pkt_fates(
-    HalFateFetcherT fate_fetcher_func, const char *java_fate_type,
-    JNIEnv *env, jclass cls, jint iface, jobjectArray reports) {
-
-    JNIHelper helper(env);
-    const size_t n_reports_wanted =
-        std::min(helper.getArrayLength(reports), MAX_FATE_LOG_LEN);
-
-    std::vector<FateReportT> report_bufs(n_reports_wanted, make_default_fate<FateReportT>());
-    size_t n_reports_provided = 0;
-    wifi_error result = fate_fetcher_func(
-        getIfaceHandle(helper, cls, iface),
-        report_bufs.data(),
-        n_reports_wanted,
-        &n_reports_provided);
-    if (result != WIFI_SUCCESS) {
-        return result;
-    }
-
-    if (n_reports_provided > n_reports_wanted) {
-        LOG_ALWAYS_FATAL(
-            "HAL data exceeds request; memory may be corrupt (provided: %zu, requested: %zu)",
-            n_reports_provided, n_reports_wanted);
-    }
-
-    for (size_t i = 0; i < n_reports_provided; ++i) {
-        const FateReportT& report(report_bufs[i]);
-
-        const char *frame_bytes_native = nullptr;
-        size_t max_frame_len;
-        switch (report.frame_inf.payload_type) {
-            case FRAME_TYPE_UNKNOWN:
-            case FRAME_TYPE_ETHERNET_II:
-                max_frame_len = MAX_FRAME_LEN_ETHERNET;
-                frame_bytes_native = report.frame_inf.frame_content.ethernet_ii_bytes;
-                break;
-            case FRAME_TYPE_80211_MGMT:
-                max_frame_len = MAX_FRAME_LEN_80211_MGMT;
-                frame_bytes_native = report.frame_inf.frame_content.ieee_80211_mgmt_bytes;
-                break;
-            default:
-                max_frame_len = 0;
-                frame_bytes_native = 0;
-        }
-
-        size_t copy_len = report.frame_inf.frame_len;
-        if (copy_len > max_frame_len) {
-            ALOGW("Overly long frame (len: %zu, max: %zu)", copy_len, max_frame_len);
-            copy_len = max_frame_len;
-        }
-
-        JNIObject<jbyteArray> frame_bytes_java = helper.newByteArray(copy_len);
-        if (frame_bytes_java.isNull()) {
-            ALOGE("Failed to allocate frame data buffer");
-            return WIFI_ERROR_OUT_OF_MEMORY;
-        }
-        helper.setByteArrayRegion(frame_bytes_java, 0, copy_len,
-            reinterpret_cast<const jbyte *>(frame_bytes_native));
-
-        JNIObject<jobject> fate_report = helper.createObjectWithArgs(
-            java_fate_type,
-            "(BJB[B)V",  // byte, long, byte, byte array
-            static_cast<jbyte>(report.fate),
-            static_cast<jlong>(report.frame_inf.driver_timestamp_usec),
-            static_cast<jbyte>(report.frame_inf.payload_type),
-            frame_bytes_java.get());
-        if (fate_report.isNull()) {
-            ALOGE("Failed to create %s", java_fate_type);
-            return WIFI_ERROR_OUT_OF_MEMORY;
-        }
-        helper.setObjectArrayElement(reports, i, fate_report);
-    }
-
-    return result;
-}
-
-static jint android_net_wifi_get_tx_pkt_fates(JNIEnv *env, jclass cls, jint iface,
-    jobjectArray reports) {
-
-    return get_pkt_fates<wifi_tx_report>(
-        hal_fn.wifi_get_tx_pkt_fates, "com/android/server/wifi/WifiNative$TxFateReport",
-        env, cls, iface, reports);
-}
-
-static jint android_net_wifi_get_rx_pkt_fates(JNIEnv *env, jclass cls, jint iface,
-    jobjectArray reports) {
-
-    return get_pkt_fates<wifi_rx_report>(
-        hal_fn.wifi_get_rx_pkt_fates, "com/android/server/wifi/WifiNative$RxFateReport",
-        env, cls, iface, reports);
-}
-
-// ----------------------------------------------------------------------------
-// ePno framework
-// ----------------------------------------------------------------------------
-
-
-static void onPnoNetworkFound(wifi_request_id id,
-                                          unsigned num_results, wifi_scan_result *results) {
-    JNIHelper helper(mVM);
-    ALOGD("onPnoNetworkFound called, vm = %p, obj = %p, num_results %u", mVM, mCls, num_results);
-
-    if (results == NULL || num_results == 0) {
-       ALOGE("onPnoNetworkFound: Error no results");
-       return;
-    }
-
-    JNIObject<jobjectArray> scanResults = helper.newObjectArray(num_results,
-            "android/net/wifi/ScanResult", NULL);
-    if (scanResults == NULL) {
-        ALOGE("onpnoNetworkFound: Error in allocating scanResults array");
-        return;
-    }
-
-    JNIObject<jintArray> beaconCaps = helper.newIntArray(num_results);
-    if (beaconCaps == NULL) {
-        ALOGE("onpnoNetworkFound: Error in allocating beaconCaps array");
-        return;
-    }
-
-    for (unsigned i=0; i<num_results; i++) {
-
-        JNIObject<jobject> scanResult = createScanResult(helper, &results[i], true);
-        if (scanResult == NULL) {
-            ALOGE("Error in creating scan result");
-            return;
-        }
-
-        helper.setObjectArrayElement(scanResults, i, scanResult);
-        helper.setIntArrayRegion(beaconCaps, i, 1, (jint *)&(results[i].capability));
-
-        if (DBG) {
-            ALOGD("ScanResult: IE length %d, i %u, <%s> rssi=%d %02x:%02x:%02x:%02x:%02x:%02x",
-                    results->ie_length, i, results[i].ssid, results[i].rssi,
-                    results[i].bssid[0], results[i].bssid[1],results[i].bssid[2],
-                    results[i].bssid[3], results[i].bssid[4], results[i].bssid[5]);
-        }
-    }
-
-    helper.reportEvent(mCls, "onPnoNetworkFound", "(I[Landroid/net/wifi/ScanResult;[I)V", id,
-               scanResults.get(), beaconCaps.get());
-}
-
-static jboolean android_net_wifi_setPnoListNative(
-        JNIEnv *env, jclass cls, jint iface, jint id, jobject settings)  {
-
-    JNIHelper helper(env);
-    wifi_epno_handler handler;
-    handler.on_network_found = &onPnoNetworkFound;
-
-    wifi_interface_handle handle = getIfaceHandle(helper, cls, iface);
-    ALOGD("configure ePno list request [%d] = %p", id, handle);
-
-    if (settings == NULL) {
-        return false;
-    }
-
-    JNIObject<jobjectArray> list = helper.getArrayField(settings, "networkList",
-            "[Lcom/android/server/wifi/WifiNative$PnoNetwork;");
-    if (list == NULL) {
-        return false;
-    }
-
-    size_t len = helper.getArrayLength(list);
-    if (len > (size_t)MAX_EPNO_NETWORKS) {
-        return false;
-    }
-
-    wifi_epno_params params;
-    memset(&params, 0, sizeof(params));
-
-    for (unsigned int i = 0; i < len; i++) {
-
-        JNIObject<jobject> pno_net = helper.getObjectArrayElement(list, i);
-        if (pno_net == NULL) {
-            ALOGE("setPnoListNative: could not get element %d", i);
-            continue;
-        }
-
-        JNIObject<jstring> sssid = helper.getStringField(pno_net, "ssid");
-        if (sssid == NULL) {
-              ALOGE("Error setPnoListNative: getting ssid field");
-              return false;
-        }
-
-        ScopedUtfChars chars(env, (jstring)sssid.get());
-        const char *ssid = chars.c_str();
-        if (ssid == NULL) {
-             ALOGE("Error setPnoListNative: getting ssid");
-             return false;
-        }
-        int ssid_len = strnlen((const char*)ssid, 33);
-        if (ssid_len > 32) {
-           ALOGE("Error setPnoListNative: long ssid %zu", strnlen((const char*)ssid, 256));
-           return false;
-        }
-
-        if (ssid_len > 1 && ssid[0] == '"' && ssid[ssid_len-1] == '"')
-        {
-            // strip leading and trailing '"'
-            ssid++;
-            ssid_len-=2;
-        }
-        if (ssid_len == 0) {
-            ALOGE("Error setPnoListNative: zero length ssid, skip it");
-            continue;
-        }
-        memcpy(params.networks[i].ssid, ssid, ssid_len);
-
-        params.networks[i].auth_bit_field = helper.getByteField(pno_net, "auth_bit_field");
-        params.networks[i].flags = helper.getByteField(pno_net, "flags");
-        ALOGD(" setPnoListNative: idx %u auth %x flags %x [%s]", i,
-                params.networks[i].auth_bit_field, params.networks[i].flags,
-                params.networks[i].ssid);
-    }
-    params.min5GHz_rssi = helper.getIntField(settings, "min5GHzRssi");
-    params.min24GHz_rssi = helper.getIntField(settings, "min24GHzRssi");
-    params.initial_score_max = helper.getIntField(settings, "initialScoreMax");
-    params.current_connection_bonus = helper.getIntField(settings, "currentConnectionBonus");
-    params.same_network_bonus = helper.getIntField(settings, "sameNetworkBonus");
-    params.secure_bonus = helper.getIntField(settings, "secureBonus");
-    params.band5GHz_bonus = helper.getIntField(settings, "band5GHzBonus");
-    params.num_networks = len;
-
-    int result = hal_fn.wifi_set_epno_list(id, handle, &params, handler);
-    ALOGD(" setPnoListNative: result %d", result);
-
-    return result >= 0;
-}
-
-static jboolean android_net_wifi_resetPnoListNative(
-        JNIEnv *env, jclass cls, jint iface, jint id)  {
-
-    JNIHelper helper(env);
-
-    wifi_interface_handle handle = getIfaceHandle(helper, cls, iface);
-    ALOGD("reset ePno list request [%d] = %p", id, handle);
-
-    // stop pno
-    int result = hal_fn.wifi_reset_epno_list(id, handle);
-    ALOGD(" ressetPnoListNative: result = %d", result);
-    return result >= 0;
-}
-
-static jint android_net_wifi_start_sending_offloaded_packet(JNIEnv *env, jclass cls, jint iface,
-                    jint idx, jbyteArray srcMac, jbyteArray dstMac, jbyteArray pkt, jint period)  {
-    JNIHelper helper(env);
-    wifi_interface_handle handle = getIfaceHandle(helper, cls, iface);
-    ALOGD("Start packet offload [%d] = %p", idx, handle);
-    wifi_error ret;
-    wifi_request_id id = idx;
-
-    ScopedBytesRO pktBytes(env, pkt), srcMacBytes(env, srcMac), dstMacBytes(env, dstMac);
-
-    byte * pkt_data = (byte*) pktBytes.get();
-    unsigned short pkt_len = env->GetArrayLength(pkt);
-    byte* src_mac_addr = (byte*) srcMacBytes.get();
-    byte* dst_mac_addr = (byte*) dstMacBytes.get();
-    int i;
-    char macAddr[32];
-    snprintf(macAddr, sizeof(macAddr), "%0x:%0x:%0x:%0x:%0x:%0x",
-             src_mac_addr[0], src_mac_addr[1], src_mac_addr[2], src_mac_addr[3],
-             src_mac_addr[4], src_mac_addr[5]);
-    ALOGD("src_mac_addr %s", macAddr);
-    snprintf(macAddr, sizeof(macAddr), "%0x:%0x:%0x:%0x:%0x:%0x",
-             dst_mac_addr[0], dst_mac_addr[1], dst_mac_addr[2], dst_mac_addr[3],
-             dst_mac_addr[4], dst_mac_addr[5]);
-    ALOGD("dst_mac_addr %s", macAddr);
-    ALOGD("pkt_len %d\n", pkt_len);
-    ALOGD("Pkt data : ");
-    for(i = 0; i < pkt_len; i++) {
-        ALOGD(" %x ", pkt_data[i]);
-    }
-    ALOGD("\n");
-    ret =  hal_fn.wifi_start_sending_offloaded_packet(id, handle, pkt_data, pkt_len,
-                src_mac_addr, dst_mac_addr, period);
-    ALOGD("ret= %d\n", ret);
-    return ret;
-}
-
-static jint android_net_wifi_stop_sending_offloaded_packet(JNIEnv *env, jclass cls,
-                    jint iface, jint idx) {
-    int ret;
-    JNIHelper helper(env);
-    wifi_interface_handle handle = getIfaceHandle(helper, cls, iface);
-    ALOGD("Stop packet offload [%d] = %p", idx, handle);
-    ret =  hal_fn.wifi_stop_sending_offloaded_packet(idx, handle);
-    ALOGD("ret= %d\n", ret);
-    return ret;
-}
-
-static void onRssiThresholdbreached(wifi_request_id id, u8 *cur_bssid, s8 cur_rssi) {
-
-    ALOGD("RSSI threshold breached, cur RSSI - %d!!\n", cur_rssi);
-    ALOGD("BSSID %02x:%02x:%02x:%02x:%02x:%02x\n",
-            cur_bssid[0], cur_bssid[1], cur_bssid[2],
-            cur_bssid[3], cur_bssid[4], cur_bssid[5]);
-    JNIHelper helper(mVM);
-    //ALOGD("onRssiThresholdbreached called, vm = %p, obj = %p, env = %p", mVM, mCls, env);
-    helper.reportEvent(mCls, "onRssiThresholdBreached", "(IB)V", id, cur_rssi);
-}
-
-static jint android_net_wifi_start_rssi_monitoring_native(JNIEnv *env, jclass cls, jint iface,
-        jint idx, jbyte maxRssi, jbyte minRssi) {
-
-    JNIHelper helper(env);
-    wifi_interface_handle handle = getIfaceHandle(helper, cls, iface);
-    ALOGD("Start Rssi monitoring = %p", handle);
-    ALOGD("MinRssi %d MaxRssi %d", minRssi, maxRssi);
-    wifi_error ret;
-    wifi_request_id id = idx;
-    wifi_rssi_event_handler eh;
-    eh.on_rssi_threshold_breached = onRssiThresholdbreached;
-    ret = hal_fn.wifi_start_rssi_monitoring(id, handle, maxRssi, minRssi, eh);
-    return ret;
-}
-
-static jint android_net_wifi_stop_rssi_monitoring_native(JNIEnv *env, jclass cls,
-        jint iface, jint idx) {
-    JNIHelper helper(env);
-    wifi_interface_handle handle = getIfaceHandle(helper, cls, iface);
-    ALOGD("Stop Rssi monitoring = %p", handle);
-    wifi_error ret;
-    wifi_request_id id = idx;
-    ret = hal_fn.wifi_stop_rssi_monitoring(id, handle);
-    return ret;
-}
-
-static jobject android_net_wifi_get_wlan_wake_reason_count(JNIEnv *env, jclass cls, jint iface) {
-
-    JNIHelper helper(env);
-    WLAN_DRIVER_WAKE_REASON_CNT wake_reason_cnt;
-    int cmd_event_wake_cnt_array[WAKE_REASON_TYPE_MAX];
-    int driver_fw_local_wake_cnt_array[WAKE_REASON_TYPE_MAX];
-    wifi_interface_handle handle = getIfaceHandle(helper, cls, iface);
-    wifi_error ret;
-
-    wake_reason_cnt.cmd_event_wake_cnt = cmd_event_wake_cnt_array;
-    wake_reason_cnt.cmd_event_wake_cnt_sz = WAKE_REASON_TYPE_MAX;
-    wake_reason_cnt.cmd_event_wake_cnt_used = 0;
-
-    wake_reason_cnt.driver_fw_local_wake_cnt = driver_fw_local_wake_cnt_array;
-    wake_reason_cnt.driver_fw_local_wake_cnt_sz = WAKE_REASON_TYPE_MAX;
-    wake_reason_cnt.driver_fw_local_wake_cnt_used = 0;
-
-    ret = hal_fn.wifi_get_wake_reason_stats(handle, &wake_reason_cnt);
-
-    if (ret != WIFI_SUCCESS) {
-        ALOGE("android_net_wifi_get_wlan_wake_reason_count: failed to get wake reason count\n");
-        return NULL;
-    }
-
-    JNIObject<jobject> stats = helper.createObject( "android/net/wifi/WifiWakeReasonAndCounts");
-    if (stats == NULL) {
-        ALOGE("android_net_wifi_get_wlan_wake_reason_count: error allocating object\n");
-        return NULL;
-    }
-    JNIObject<jintArray> cmd_wake_arr =
-            helper.newIntArray(wake_reason_cnt.cmd_event_wake_cnt_used);
-    if (cmd_wake_arr == NULL) {
-        ALOGE("android_net_wifi_get_wlan_wake_reason_count: error allocating array object\n");
-        return NULL;
-    }
-    JNIObject<jintArray> local_wake_arr =
-            helper.newIntArray(wake_reason_cnt.driver_fw_local_wake_cnt_used);
-    if (local_wake_arr == NULL) {
-        ALOGE("android_net_wifi_get_wlan_wake_reason_count: error allocating array object\n");
-        return NULL;
-    }
-
-    helper.setIntField(stats, "totalCmdEventWake", wake_reason_cnt.total_cmd_event_wake);
-    helper.setIntField(stats, "totalDriverFwLocalWake", wake_reason_cnt.total_driver_fw_local_wake);
-    helper.setIntField(stats, "totalRxDataWake", wake_reason_cnt.total_rx_data_wake);
-    helper.setIntField(stats, "rxUnicast", wake_reason_cnt.rx_wake_details.rx_unicast_cnt);
-    helper.setIntField(stats, "rxMulticast", wake_reason_cnt.rx_wake_details.rx_multicast_cnt);
-    helper.setIntField(stats, "rxBroadcast", wake_reason_cnt.rx_wake_details.rx_broadcast_cnt);
-    helper.setIntField(stats, "icmp", wake_reason_cnt.rx_wake_pkt_classification_info.icmp_pkt);
-    helper.setIntField(stats, "icmp6", wake_reason_cnt.rx_wake_pkt_classification_info.icmp6_pkt);
-    helper.setIntField(stats, "icmp6Ra", wake_reason_cnt.rx_wake_pkt_classification_info.icmp6_ra);
-    helper.setIntField(stats, "icmp6Na", wake_reason_cnt.rx_wake_pkt_classification_info.icmp6_na);
-    helper.setIntField(stats, "icmp6Ns", wake_reason_cnt.rx_wake_pkt_classification_info.icmp6_ns);
-    helper.setIntField(stats, "ipv4RxMulticast",
-            wake_reason_cnt.rx_multicast_wake_pkt_info.ipv4_rx_multicast_addr_cnt);
-    helper.setIntField(stats, "ipv6Multicast",
-            wake_reason_cnt.rx_multicast_wake_pkt_info.ipv6_rx_multicast_addr_cnt);
-    helper.setIntField(stats, "otherRxMulticast",
-            wake_reason_cnt.rx_multicast_wake_pkt_info.other_rx_multicast_addr_cnt);
-    helper.setIntArrayRegion(cmd_wake_arr, 0, wake_reason_cnt.cmd_event_wake_cnt_used,
-            wake_reason_cnt.cmd_event_wake_cnt);
-    helper.setIntArrayRegion(local_wake_arr, 0, wake_reason_cnt.driver_fw_local_wake_cnt_used,
-            wake_reason_cnt.driver_fw_local_wake_cnt);
-    helper.setObjectField(stats, "cmdEventWakeCntArray", "[I", cmd_wake_arr);
-    helper.setObjectField(stats, "driverFWLocalWakeCntArray", "[I", local_wake_arr);
-    return stats.detach();
-}
 
 static jbyteArray android_net_wifi_readKernelLog(JNIEnv *env, jclass cls) {
     JNIHelper helper(env);
@@ -2383,15 +72,6 @@ static jbyteArray android_net_wifi_readKernelLog(JNIEnv *env, jclass cls) {
     return result.detach();
 }
 
-static jint android_net_wifi_configure_nd_offload(JNIEnv *env, jclass cls,
-        jint iface, jboolean enable) {
-    JNIHelper helper(env);
-    return hal_fn.wifi_configure_nd_offload(
-            getIfaceHandle(helper, cls, iface),
-            static_cast<int>(enable));
-}
-
-
 // ----------------------------------------------------------------------------
 
 /*
@@ -2399,104 +79,7 @@ static jint android_net_wifi_configure_nd_offload(JNIEnv *env, jclass cls,
  */
 static JNINativeMethod gWifiMethods[] = {
     /* name, signature, funcPtr */
-
-    { "connectToSupplicantNative", "()Z", (void *)android_net_wifi_connectToSupplicant },
-    { "closeSupplicantConnectionNative", "()V",
-            (void *)android_net_wifi_closeSupplicantConnection },
-    { "waitForEventNative", "()Ljava/lang/String;", (void*)android_net_wifi_waitForEvent },
-    { "doBooleanCommandNative", "(Ljava/lang/String;)Z", (void*)android_net_wifi_doBooleanCommand },
-    { "doIntCommandNative", "(Ljava/lang/String;)I", (void*)android_net_wifi_doIntCommand },
-    { "doStringCommandNative", "(Ljava/lang/String;)Ljava/lang/String;",
-            (void*) android_net_wifi_doStringCommand },
-    { "startHalNative", "()Z", (void*) android_net_wifi_startHal },
-    { "stopHalNative", "()V", (void*) android_net_wifi_stopHal },
-    { "waitForHalEventNative", "()V", (void*) android_net_wifi_waitForHalEvents },
-    { "getInterfacesNative", "()I", (void*) android_net_wifi_getInterfaces},
-    { "getInterfaceNameNative", "(I)Ljava/lang/String;", (void*) android_net_wifi_getInterfaceName},
-    { "getScanCapabilitiesNative", "(ILcom/android/server/wifi/WifiNative$ScanCapabilities;)Z",
-            (void *) android_net_wifi_getScanCapabilities},
-    { "startScanNative", "(IILcom/android/server/wifi/WifiNative$ScanSettings;)Z",
-            (void*) android_net_wifi_startScan},
-    { "stopScanNative", "(II)Z", (void*) android_net_wifi_stopScan},
-    { "getScanResultsNative", "(IZ)[Landroid/net/wifi/WifiScanner$ScanData;",
-            (void *) android_net_wifi_getScanResults},
-    { "setHotlistNative", "(IILandroid/net/wifi/WifiScanner$HotlistSettings;)Z",
-            (void*) android_net_wifi_setHotlist},
-    { "resetHotlistNative", "(II)Z", (void*) android_net_wifi_resetHotlist},
-    { "trackSignificantWifiChangeNative", "(IILandroid/net/wifi/WifiScanner$WifiChangeSettings;)Z",
-            (void*) android_net_wifi_trackSignificantWifiChange},
-    { "untrackSignificantWifiChangeNative", "(II)Z",
-            (void*) android_net_wifi_untrackSignificantWifiChange},
-    { "getWifiLinkLayerStatsNative", "(I)Landroid/net/wifi/WifiLinkLayerStats;",
-            (void*) android_net_wifi_getLinkLayerStats},
-    { "setWifiLinkLayerStatsNative", "(II)V",
-            (void*) android_net_wifi_setLinkLayerStats},
-    { "getSupportedFeatureSetNative", "(I)I",
-            (void*) android_net_wifi_getSupportedFeatures},
-    { "requestRangeNative", "(II[Landroid/net/wifi/RttManager$RttParams;)Z",
-            (void*) android_net_wifi_requestRange},
-    { "cancelRangeRequestNative", "(II[Landroid/net/wifi/RttManager$RttParams;)Z",
-            (void*) android_net_wifi_cancelRange},
-    { "enableRttResponderNative",
-        "(IIILcom/android/server/wifi/WifiNative$WifiChannelInfo;)Landroid/net/wifi/RttManager$ResponderConfig;",
-            (void*) android_net_wifi_enableResponder},
-    { "disableRttResponderNative", "(II)Z",
-            (void*) android_net_wifi_disableResponder},
-
-    { "setScanningMacOuiNative", "(I[B)Z",  (void*) android_net_wifi_setScanningMacOui},
-    { "getChannelsForBandNative", "(II)[I", (void*) android_net_wifi_getValidChannels},
-    { "setDfsFlagNative",         "(IZ)Z",  (void*) android_net_wifi_setDfsFlag},
-    { "getRttCapabilitiesNative", "(I)Landroid/net/wifi/RttManager$RttCapabilities;",
-            (void*) android_net_wifi_get_rtt_capabilities},
-    { "getApfCapabilitiesNative", "(I)Landroid/net/apf/ApfCapabilities;",
-            (void*) android_net_wifi_get_apf_capabilities},
-    { "installPacketFilterNative", "(I[B)Z", (void*) android_net_wifi_install_packet_filter},
-    {"setCountryCodeHalNative", "(ILjava/lang/String;)Z",
-            (void*) android_net_wifi_set_Country_Code_Hal},
-    { "setPnoListNative", "(IILcom/android/server/wifi/WifiNative$PnoSettings;)Z",
-            (void*) android_net_wifi_setPnoListNative},
-    { "resetPnoListNative", "(II)Z", (void*) android_net_wifi_resetPnoListNative},
-    {"enableDisableTdlsNative", "(IZLjava/lang/String;)Z",
-            (void*) android_net_wifi_enable_disable_tdls},
-    {"getTdlsStatusNative", "(ILjava/lang/String;)Lcom/android/server/wifi/WifiNative$TdlsStatus;",
-            (void*) android_net_wifi_get_tdls_status},
-    {"getTdlsCapabilitiesNative", "(I)Lcom/android/server/wifi/WifiNative$TdlsCapabilities;",
-            (void*) android_net_wifi_get_tdls_capabilities},
-    {"getSupportedLoggerFeatureSetNative","(I)I",
-            (void*) android_net_wifi_get_supported_logger_feature},
-    {"getDriverVersionNative", "(I)Ljava/lang/String;",
-            (void*) android_net_wifi_get_driver_version},
-    {"getFirmwareVersionNative", "(I)Ljava/lang/String;",
-            (void*) android_net_wifi_get_firmware_version},
-    {"getRingBufferStatusNative", "(I)[Lcom/android/server/wifi/WifiNative$RingBufferStatus;",
-            (void*) android_net_wifi_get_ring_buffer_status},
-    {"startLoggingRingBufferNative", "(IIIIILjava/lang/String;)Z",
-            (void*) android_net_wifi_start_logging_ring_buffer},
-    {"getRingBufferDataNative", "(ILjava/lang/String;)Z",
-            (void*) android_net_wifi_get_ring_buffer_data},
-    {"getFwMemoryDumpNative","(I)Z", (void*) android_net_wifi_get_fw_memory_dump},
-    {"getDriverStateDumpNative","(I)[B", (void*) android_net_wifi_get_driver_state_dump},
-    {"setLoggingEventHandlerNative", "(II)Z", (void *) android_net_wifi_set_log_handler},
-    {"resetLogHandlerNative", "(II)Z", (void *) android_net_wifi_reset_log_handler},
-    {"startPktFateMonitoringNative", "(I)I", (void*) android_net_wifi_start_pkt_fate_monitoring},
-    {"getTxPktFatesNative", "(I[Lcom/android/server/wifi/WifiNative$TxFateReport;)I",
-            (void*) android_net_wifi_get_tx_pkt_fates},
-    {"getRxPktFatesNative", "(I[Lcom/android/server/wifi/WifiNative$RxFateReport;)I",
-            (void*) android_net_wifi_get_rx_pkt_fates},
-    { "startSendingOffloadedPacketNative", "(II[B[B[BI)I",
-             (void*)android_net_wifi_start_sending_offloaded_packet},
-    { "stopSendingOffloadedPacketNative", "(II)I",
-             (void*)android_net_wifi_stop_sending_offloaded_packet},
-    {"startRssiMonitoringNative", "(IIBB)I",
-            (void*)android_net_wifi_start_rssi_monitoring_native},
-    {"stopRssiMonitoringNative", "(II)I",
-            (void*)android_net_wifi_stop_rssi_monitoring_native},
-    { "getWlanWakeReasonCountNative", "(I)Landroid/net/wifi/WifiWakeReasonAndCounts;",
-            (void*) android_net_wifi_get_wlan_wake_reason_count},
-    {"isGetChannelsForBandSupportedNative", "()Z",
-            (void*)android_net_wifi_is_get_channels_for_band_supported},
     {"readKernelLogNative", "()[B", (void*)android_net_wifi_readKernelLog},
-    {"configureNeighborDiscoveryOffload", "(IZ)I", (void*)android_net_wifi_configure_nd_offload},
 };
 
 /* User to register native functions */
diff --git a/service/jni/jni_helper.cpp b/service/jni/jni_helper.cpp
index ba3f40d8e..150f694f4 100644
--- a/service/jni/jni_helper.cpp
+++ b/service/jni/jni_helper.cpp
@@ -22,7 +22,6 @@
 #include <utils/Log.h>
 #include <utils/String16.h>
 #include <utils/misc.h>
-#include <wifi_system/wifi.h>
 
 #include "jni_helper.h"
 
@@ -51,666 +50,19 @@ JNIHelper::~JNIHelper()
     }
 }
 
-jobject JNIHelper::newGlobalRef(jobject obj) {
-    return mEnv->NewGlobalRef(obj);
-}
-
-void JNIHelper::deleteGlobalRef(jobject obj) {
-    mEnv->DeleteGlobalRef(obj);
-}
-
 jobject JNIHelper::newLocalRef(jobject obj) {
-    return mEnv->NewLocalRef(obj);
+      return mEnv->NewLocalRef(obj);
 }
 
 void JNIHelper::deleteLocalRef(jobject obj) {
-    mEnv->DeleteLocalRef(obj);
-}
-
-void JNIHelper::throwException(const char *message, int line)
-{
-    ALOGE("error at line %d: %s", line, message);
-
-    const char *className = "java/lang/Exception";
-
-    jclass exClass = mEnv->FindClass(className );
-    if ( exClass == NULL ) {
-        ALOGE("Could not find exception class to throw error");
-        ALOGE("error at line %d: %s", line, message);
-        return;
-    }
-
-    mEnv->ThrowNew(exClass, message);
-}
-
-jboolean JNIHelper::getBoolField(jobject obj, const char *name)
-{
-    JNIObject<jclass> cls(*this, mEnv->GetObjectClass(obj));
-    jfieldID field = mEnv->GetFieldID(cls, name, "Z");
-    if (field == 0) {
-        THROW(*this, "Error in accessing field");
-        return 0;
-    }
-
-    return mEnv->GetBooleanField(obj, field);
-}
-
-jint JNIHelper::getIntField(jobject obj, const char *name)
-{
-    JNIObject<jclass> cls(*this, mEnv->GetObjectClass(obj));
-    jfieldID field = mEnv->GetFieldID(cls, name, "I");
-    if (field == 0) {
-        THROW(*this, "Error in accessing field");
-        return 0;
-    }
-
-    return mEnv->GetIntField(obj, field);
-}
-
-jbyte JNIHelper::getByteField(jobject obj, const char *name)
-{
-    JNIObject<jclass> cls(*this, mEnv->GetObjectClass(obj));
-    jfieldID field = mEnv->GetFieldID(cls, name, "B");
-    if (field == 0) {
-        THROW(*this, "Error in accessing field");
-        return 0;
-    }
-
-    return mEnv->GetByteField(obj, field);
-}
-
-jlong JNIHelper::getLongField(jobject obj, const char *name)
-{
-    JNIObject<jclass> cls(*this, mEnv->GetObjectClass(obj));
-    jfieldID field = mEnv->GetFieldID(cls, name, "J");
-    if (field == 0) {
-        THROW(*this, "Error in accessing field");
-        return 0;
-    }
-
-    return mEnv->GetLongField(obj, field);
-}
-
-JNIObject<jstring> JNIHelper::getStringField(jobject obj, const char *name)
-{
-    JNIObject<jobject> m = getObjectField(obj, name, "Ljava/lang/String;");
-    if (m == NULL) {
-        THROW(*this, "Error in accessing field");
-        return JNIObject<jstring>(*this, NULL);
-    }
-
-    return JNIObject<jstring>(*this, (jstring)m.detach());
-}
-
-bool JNIHelper::getStringFieldValue(jobject obj, const char *name, char *buf, int size)
-{
-    JNIObject<jclass> cls(*this, mEnv->GetObjectClass(obj));
-    jfieldID field = mEnv->GetFieldID(cls, name, "Ljava/lang/String;");
-    if (field == 0) {
-        THROW(*this, "Error in accessing field");
-        return 0;
-    }
-
-    JNIObject<jobject> value(*this, mEnv->GetObjectField(obj, field));
-    JNIObject<jstring> string(*this, (jstring)value.clone());
-    ScopedUtfChars chars(mEnv, string);
-
-    const char *utf = chars.c_str();
-    if (utf == NULL) {
-        THROW(*this, "Error in accessing value");
-        return false;
-    }
-
-    if (*utf != 0 && size < 1) {
-        return false;
-    }
-
-    strncpy(buf, utf, size);
-    if (size > 0) {
-        buf[size - 1] = 0;
-    }
-
-    return true;
-}
-
-jlong JNIHelper::getStaticLongField(jobject obj, const char *name)
-{
-    JNIObject<jclass> cls(*this, mEnv->GetObjectClass(obj));
-    return getStaticLongField(cls, name);
-}
-
-jlong JNIHelper::getStaticLongField(jclass cls, const char *name)
-{
-    jfieldID field = mEnv->GetStaticFieldID(cls, name, "J");
-    if (field == 0) {
-        THROW(*this, "Error in accessing field");
-        return 0;
-    }
-    //ALOGE("getStaticLongField %s %p", name, cls);
-    return mEnv->GetStaticLongField(cls, field);
-}
-
-JNIObject<jobject> JNIHelper::getObjectField(jobject obj, const char *name, const char *type)
-{
-    JNIObject<jclass> cls(*this, mEnv->GetObjectClass(obj));
-    jfieldID field = mEnv->GetFieldID(cls, name, type);
-    if (field == 0) {
-        THROW(*this, "Error in accessing field");
-        return JNIObject<jobject>(*this, NULL);
-    }
-
-    return JNIObject<jobject>(*this, mEnv->GetObjectField(obj, field));
-}
-
-JNIObject<jobjectArray> JNIHelper::getArrayField(jobject obj, const char *name, const char *type)
-{
-    JNIObject<jclass> cls(*this, mEnv->GetObjectClass(obj));
-    jfieldID field = mEnv->GetFieldID(cls, name, type);
-    if (field == 0) {
-        THROW(*this, "Error in accessing field");
-        return JNIObject<jobjectArray>(*this, NULL);
-    }
-
-    return JNIObject<jobjectArray>(*this, (jobjectArray)mEnv->GetObjectField(obj, field));
-}
-
-jlong JNIHelper::getLongArrayField(jobject obj, const char *name, int index)
-{
-    JNIObject<jclass> cls(*this, mEnv->GetObjectClass(obj));
-    jfieldID field = mEnv->GetFieldID(cls, name, "[J");
-    if (field == 0) {
-        THROW(*this, "Error in accessing field definition");
-        return 0;
-    }
-
-    JNIObject<jlongArray> array(*this, (jlongArray)mEnv->GetObjectField(obj, field));
-    if (array == NULL) {
-        THROW(*this, "Error in accessing array");
-        return 0;
-    }
-
-    jlong *elem = mEnv->GetLongArrayElements(array, 0);
-    if (elem == NULL) {
-        THROW(*this, "Error in accessing index element");
-        return 0;
-    }
-
-    jlong value = elem[index];
-    mEnv->ReleaseLongArrayElements(array, elem, 0);
-    return value;
-}
-
-void JNIHelper::getByteArrayField(jobject obj, const char *name, byte *buf, size_t size) {
-    JNIObject<jclass> cls(*this, mEnv->GetObjectClass(obj));
-    jfieldID field = mEnv->GetFieldID(cls, name, "[B");
-    if (field == 0) {
-        THROW(*this, "Error in accessing field definition");
-        return;
-    }
-
-    JNIObject<jbyteArray> array(*this, (jbyteArray)mEnv->GetObjectField(obj, field));
-    if (array == NULL) {
-        THROW(*this, "Error in accessing array");
-        return;
-    }
-
-    jbyte *elem = mEnv->GetByteArrayElements(array, 0);
-    if (elem == NULL) {
-        THROW(*this, "Error in accessing index element");
-        return;
-    }
-
-    memcpy(buf, elem, size);
-    mEnv->ReleaseByteArrayElements(array, elem, 0);
-}
-
-void JNIHelper::getByteArrayField(jobject obj, const char *name, byte *buf, size_t *size, int max_size) {
-    JNIObject<jclass> cls(*this, mEnv->GetObjectClass(obj));
-    jfieldID field = mEnv->GetFieldID(cls, name, "[B");
-    if (field == 0) {
-        THROW(*this, "Error in accessing field definition");
-        return;
-    }
-
-    jbyteArray byteArray = (jbyteArray)mEnv->GetObjectField(obj, field);
-    if (byteArray == NULL) {
-        *size = 0;
-        return;
-    }
-
-    JNIObject<jbyteArray> array(*this, byteArray);
-    *size = getArrayLength(byteArray);
-    int use_size = *size;
-    if (use_size > max_size) {
-        use_size = max_size;
-    }
-
-    jbyte *elem = mEnv->GetByteArrayElements(array, 0);
-    if (elem == NULL) {
-        THROW(*this, "Error in accessing index element");
-        return;
-    }
-
-    memcpy(buf, elem, use_size);
-    mEnv->ReleaseByteArrayElements(array, elem, 0);
-}
-
-jlong JNIHelper::getStaticLongArrayField(jobject obj, const char *name, int index)
-{
-    JNIObject<jclass> cls(*this, mEnv->GetObjectClass(obj));
-    return getStaticLongArrayField(cls, name, index);
-}
-
-jlong JNIHelper::getStaticLongArrayField(jclass cls, const char *name, int index)
-{
-    jfieldID field = mEnv->GetStaticFieldID(cls, name, "[J");
-    if (field == 0) {
-        THROW(*this, "Error in accessing field definition");
-        return 0;
-    }
-
-    JNIObject<jlongArray> array(*this, (jlongArray)mEnv->GetStaticObjectField(cls, field));
-    jlong *elem = mEnv->GetLongArrayElements(array, 0);
-    if (elem == NULL) {
-        THROW(*this, "Error in accessing index element");
-        return 0;
-    }
-
-    jlong value = elem[index];
-    mEnv->ReleaseLongArrayElements(array, elem, 0);
-    return value;
-}
-
-JNIObject<jobject> JNIHelper::getObjectArrayField(jobject obj, const char *name, const char *type,
-int index)
-{
-    JNIObject<jclass> cls(*this, mEnv->GetObjectClass(obj));
-    jfieldID field = mEnv->GetFieldID(cls, name, type);
-    if (field == 0) {
-        THROW(*this, "Error in accessing field definition");
-        return JNIObject<jobject>(*this, NULL);
-    }
-
-    JNIObject<jobjectArray> array(*this, (jobjectArray)mEnv->GetObjectField(obj, field));
-    JNIObject<jobject> elem(*this, mEnv->GetObjectArrayElement(array, index));
-    if (elem.isNull()) {
-        THROW(*this, "Error in accessing index element");
-        return JNIObject<jobject>(*this, NULL);
-    }
-    return elem;
-}
-
-void JNIHelper::setIntField(jobject obj, const char *name, jint value)
-{
-    JNIObject<jclass> cls(*this, mEnv->GetObjectClass(obj));
-    if (cls == NULL) {
-        THROW(*this, "Error in accessing class");
-        return;
-    }
-
-    jfieldID field = mEnv->GetFieldID(cls, name, "I");
-    if (field == NULL) {
-        THROW(*this, "Error in accessing field");
-        return;
-    }
-
-    mEnv->SetIntField(obj, field, value);
-}
-
-void JNIHelper::setByteField(jobject obj, const char *name, jbyte value)
-{
-    JNIObject<jclass> cls(*this, mEnv->GetObjectClass(obj));
-    if (cls == NULL) {
-        THROW(*this, "Error in accessing class");
-        return;
-    }
-
-    jfieldID field = mEnv->GetFieldID(cls, name, "B");
-    if (field == NULL) {
-        THROW(*this, "Error in accessing field");
-        return;
-    }
-
-    mEnv->SetByteField(obj, field, value);
-}
-
-void JNIHelper::setBooleanField(jobject obj, const char *name, jboolean value)
-{
-    JNIObject<jclass> cls(*this, mEnv->GetObjectClass(obj));
-    if (cls == NULL) {
-        THROW(*this, "Error in accessing class");
-        return;
-    }
-
-    jfieldID field = mEnv->GetFieldID(cls, name, "Z");
-    if (field == NULL) {
-        THROW(*this, "Error in accessing field");
-        return;
-    }
-
-    mEnv->SetBooleanField(obj, field, value);
-}
-
-void JNIHelper::setLongField(jobject obj, const char *name, jlong value)
-{
-    JNIObject<jclass> cls(*this, mEnv->GetObjectClass(obj));
-    if (cls == NULL) {
-        THROW(*this, "Error in accessing class");
-        return;
-    }
-
-    jfieldID field = mEnv->GetFieldID(cls, name, "J");
-    if (field == NULL) {
-        THROW(*this, "Error in accessing field");
-        return;
-    }
-
-    mEnv->SetLongField(obj, field, value);
-}
-
-void JNIHelper::setStaticLongField(jobject obj, const char *name, jlong value)
-{
-    JNIObject<jclass> cls(*this, mEnv->GetObjectClass(obj));
-    if (cls == NULL) {
-        THROW(*this, "Error in accessing class");
-        return;
-    }
-
-    setStaticLongField(cls, name, value);
-}
-
-void JNIHelper::setStaticLongField(jclass cls, const char *name, jlong value)
-{
-    jfieldID field = mEnv->GetStaticFieldID(cls, name, "J");
-    if (field == NULL) {
-        THROW(*this, "Error in accessing field");
-        return;
-    }
-
-    mEnv->SetStaticLongField(cls, field, value);
-}
-
-void JNIHelper::setLongArrayField(jobject obj, const char *name, jlongArray value)
-{
-    JNIObject<jclass> cls(*this, mEnv->GetObjectClass(obj));
-    if (cls == NULL) {
-        THROW(*this, "Error in accessing field");
-        return;
-    }
-
-    jfieldID field = mEnv->GetFieldID(cls, name, "[J");
-    if (field == NULL) {
-        THROW(*this, "Error in accessing field");
-        return;
-    }
-
-    mEnv->SetObjectField(obj, field, value);
-}
-
-void JNIHelper::setStaticLongArrayField(jobject obj, const char *name, jlongArray value)
-{
-    JNIObject<jclass> cls(*this, mEnv->GetObjectClass(obj));
-    if (cls == NULL) {
-        THROW(*this, "Error in accessing field");
-        return;
-    }
-
-    setStaticLongArrayField(cls, name, value);
-}
-
-void JNIHelper::setStaticLongArrayField(jclass cls, const char *name, jlongArray value)
-{
-    jfieldID field = mEnv->GetStaticFieldID(cls, name, "[J");
-    if (field == NULL) {
-        THROW(*this, "Error in accessing field");
-        return;
-    }
-
-    mEnv->SetStaticObjectField(cls, field, value);
-    ALOGD("array field set");
-}
-
-void JNIHelper::setLongArrayElement(jobject obj, const char *name, int index, jlong value)
-{
-    JNIObject<jclass> cls(*this, mEnv->GetObjectClass(obj));
-    if (cls == NULL) {
-        THROW(*this, "Error in accessing field");
-        return;
-    }
-
-    jfieldID field = mEnv->GetFieldID(cls, name, "[J");
-    if (field == NULL) {
-        THROW(*this, "Error in accessing field");
-        return;
-    }
-
-    JNIObject<jlongArray> array(*this, (jlongArray)mEnv->GetObjectField(obj, field));
-    if (array == NULL) {
-        THROW(*this, "Error in accessing array");
-        return;
-    }
-
-    jlong *elem = mEnv->GetLongArrayElements(array, NULL);
-    if (elem == NULL) {
-        THROW(*this, "Error in accessing index element");
-        return;
-    }
-
-    elem[index] = value;
-    mEnv->ReleaseLongArrayElements(array, elem, 0);
-}
-
-void JNIHelper::setObjectField(jobject obj, const char *name, const char *type, jobject value)
-{
-    JNIObject<jclass> cls(*this, mEnv->GetObjectClass(obj));
-    if (cls == NULL) {
-        THROW(*this, "Error in accessing class");
-        return;
-    }
-
-    jfieldID field = mEnv->GetFieldID(cls, name, type);
-    if (field == NULL) {
-        THROW(*this, "Error in accessing field");
-        return;
-    }
-
-    mEnv->SetObjectField(obj, field, value);
-}
-
-jboolean JNIHelper::setStringField(jobject obj, const char *name, const char *value)
-{
-    JNIObject<jstring> str(*this, mEnv->NewStringUTF(value));
-
-    if (mEnv->ExceptionCheck()) {
-        mEnv->ExceptionDescribe();
-        mEnv->ExceptionClear();
-        return false;
-    }
-
-    if (str == NULL) {
-        THROW(*this, "Error creating string");
-        return false;
-    }
-
-    setObjectField(obj, name, "Ljava/lang/String;", str);
-    return true;
-}
-
-void JNIHelper::reportEvent(jclass cls, const char *method, const char *signature, ...)
-{
-    va_list params;
-    va_start(params, signature);
-
-    jmethodID methodID = mEnv->GetStaticMethodID(cls, method, signature);
-    if (methodID == 0) {
-        ALOGE("Error in getting method ID");
-        va_end(params);
-        return;
-    }
-
-    mEnv->CallStaticVoidMethodV(cls, methodID, params);
-    if (mEnv->ExceptionCheck()) {
-        mEnv->ExceptionDescribe();
-        mEnv->ExceptionClear();
-    }
-
-    va_end(params);
-}
-
-void JNIHelper::callMethod(jobject obj, const char *method, const char *signature, ...)
-{
-    va_list params;
-    va_start(params, signature);
-
-    jclass cls = mEnv->GetObjectClass(obj);
-    jmethodID methodID = mEnv->GetMethodID(cls, method, signature);
-    if (methodID == 0) {
-        ALOGE("Error in getting method ID");
-        va_end(params);
-        return;
-    }
-
-    mEnv->CallVoidMethodV(obj, methodID, params);
-    if (mEnv->ExceptionCheck()) {
-        mEnv->ExceptionDescribe();
-        mEnv->ExceptionClear();
-    }
-
-    va_end(params);
-}
-
-jboolean JNIHelper::callStaticMethod(jclass cls, const char *method, const char *signature, ...)
-{
-    va_list params;
-    va_start(params, signature);
-
-    jmethodID methodID = mEnv->GetStaticMethodID(cls, method, signature);
-    if (methodID == 0) {
-        ALOGE("Error in getting method ID");
-        va_end(params);
-        return false;
-    }
-
-    jboolean result = mEnv->CallStaticBooleanMethodV(cls, methodID, params);
-    if (mEnv->ExceptionCheck()) {
-        mEnv->ExceptionDescribe();
-        mEnv->ExceptionClear();
-        va_end(params);
-        return false;
-    }
-
-    va_end(params);
-    return result;
-}
-
-JNIObject<jobject> JNIHelper::createObject(const char *className) {
-    return createObjectWithArgs(className, "()V");
-}
-
-JNIObject<jobject> JNIHelper::createObjectWithArgs(
-    const char *className, const char *signature, ...)
-{
-    va_list params;
-    va_start(params, signature);
-
-    JNIObject<jclass> cls(*this, mEnv->FindClass(className));
-    if (cls == NULL) {
-        ALOGE("Error in finding class %s", className);
-        va_end(params);
-        return JNIObject<jobject>(*this, NULL);
-    }
-
-    jmethodID constructor = mEnv->GetMethodID(cls, "<init>", signature);
-    if (constructor == 0) {
-        ALOGE("Error in constructor ID for %s", className);
-        va_end(params);
-        return JNIObject<jobject>(*this, NULL);
-    }
-
-    JNIObject<jobject> obj(*this, mEnv->NewObjectV(cls, constructor, params));
-    if (obj == NULL) {
-        ALOGE("Could not create new object of %s", className);
-        va_end(params);
-        return JNIObject<jobject>(*this, NULL);
-    }
-
-    va_end(params);
-    return obj;
-}
-
-JNIObject<jobjectArray> JNIHelper::createObjectArray(const char *className, int num)
-{
-    JNIObject<jclass> cls(*this, mEnv->FindClass(className));
-    if (cls == NULL) {
-        ALOGE("Error in finding class %s", className);
-        return JNIObject<jobjectArray>(*this, NULL);
-    }
-
-    JNIObject<jobject> array(*this, mEnv->NewObjectArray(num, cls.get(), NULL));
-    if (array.get() == NULL) {
-        ALOGE("Error in creating array of class %s", className);
-        return JNIObject<jobjectArray>(*this, NULL);
-    }
-
-    return JNIObject<jobjectArray>(*this, (jobjectArray)array.detach());
-}
-
-JNIObject<jobject> JNIHelper::getObjectArrayElement(jobjectArray array, int index)
-{
-    return JNIObject<jobject>(*this, mEnv->GetObjectArrayElement(array, index));
-}
-
-JNIObject<jobject> JNIHelper::getObjectArrayElement(jobject array, int index)
-{
-    return getObjectArrayElement((jobjectArray)array, index);
-}
-
-int JNIHelper::getArrayLength(jarray array) {
-    return mEnv->GetArrayLength(array);
-}
-
-JNIObject<jobjectArray> JNIHelper::newObjectArray(int num, const char *className, jobject val) {
-    JNIObject<jclass> cls(*this, mEnv->FindClass(className));
-    if (cls == NULL) {
-        ALOGE("Error in finding class %s", className);
-        return JNIObject<jobjectArray>(*this, NULL);
-    }
-
-    return JNIObject<jobjectArray>(*this, mEnv->NewObjectArray(num, cls, val));
+      mEnv->DeleteLocalRef(obj);
 }
 
 JNIObject<jbyteArray> JNIHelper::newByteArray(int num) {
     return JNIObject<jbyteArray>(*this, mEnv->NewByteArray(num));
 }
 
-JNIObject<jintArray> JNIHelper::newIntArray(int num) {
-    return JNIObject<jintArray>(*this, mEnv->NewIntArray(num));
-}
-
-JNIObject<jlongArray> JNIHelper::newLongArray(int num) {
-    return JNIObject<jlongArray>(*this, mEnv->NewLongArray(num));
-}
-
-JNIObject<jstring> JNIHelper::newStringUTF(const char *utf) {
-    return JNIObject<jstring>(*this, mEnv->NewStringUTF(utf));
-}
-
-void JNIHelper::setObjectArrayElement(jobjectArray array, int index, jobject obj) {
-    mEnv->SetObjectArrayElement(array, index, obj);
-}
-
 void JNIHelper::setByteArrayRegion(jbyteArray array, int from, int to, const jbyte *bytes) {
     mEnv->SetByteArrayRegion(array, from, to, bytes);
 }
-
-void JNIHelper::setIntArrayRegion(jintArray array, int from, int to, const jint *ints) {
-    mEnv->SetIntArrayRegion(array, from, to, ints);
-}
-
-void JNIHelper::setLongArrayRegion(jlongArray array, int from, int to, const jlong *longs) {
-    mEnv->SetLongArrayRegion(array, from, to, longs);
-}
-
 }; // namespace android
-
-
diff --git a/service/jni/jni_helper.h b/service/jni/jni_helper.h
index 108d44b14..febb90175 100644
--- a/service/jni/jni_helper.h
+++ b/service/jni/jni_helper.h
@@ -72,108 +72,48 @@ public :
     explicit JNIHelper(JNIEnv *env);
     ~JNIHelper();
 
-    void throwException(const char *message, int line);
-
-    /* helpers to deal with members */
-    jboolean getBoolField(jobject obj, const char *name);
-    jint getIntField(jobject obj, const char *name);
-    jlong getLongField(jobject obj, const char *name);
-    JNIObject<jstring> getStringField(jobject obj, const char *name);
-    bool getStringFieldValue(jobject obj, const char *name, char *buf, int size);
-    JNIObject<jobject> getObjectField(jobject obj, const char *name, const char *type);
-    JNIObject<jobjectArray> getArrayField(jobject obj, const char *name, const char *type);
-    void getByteArrayField(jobject obj, const char *name, byte *buf, size_t size);
-    void getByteArrayField(jobject obj, const char *name, byte *buf, size_t *size, int max_size);
-    jlong getLongArrayField(jobject obj, const char *name, int index);
-    JNIObject<jobject> getObjectArrayField(
-            jobject obj, const char *name, const char *type, int index);
-    void setIntField(jobject obj, const char *name, jint value);
-    void setByteField(jobject obj, const char *name, jbyte value);
-    jbyte getByteField(jobject obj, const char *name);
-    void setBooleanField(jobject obj, const char *name, jboolean value);
-    void setLongField(jobject obj, const char *name, jlong value);
-    void setLongArrayField(jobject obj, const char *name, jlongArray value);
-    void setLongArrayElement(jobject obj, const char *name, int index, jlong value);
-    jboolean setStringField(jobject obj, const char *name, const char *value);
-    void reportEvent(jclass cls, const char *method, const char *signature, ...);
-    JNIObject<jobject> createObject(const char *className);
-    JNIObject<jobject> createObjectWithArgs(const char *className, const char *signature, ...);
-    JNIObject<jobjectArray> createObjectArray(const char *className, int size);
-    void setObjectField(jobject obj, const char *name, const char *type, jobject value);
-    void callMethod(jobject obj, const char *method, const char *signature, ...);
-
     /* helpers to deal with static members */
-    jlong getStaticLongField(jobject obj, const char *name);
-    jlong getStaticLongField(jclass cls, const char *name);
-    void setStaticLongField(jobject obj, const char *name, jlong value);
-    void setStaticLongField(jclass cls, const char *name, jlong value);
-    jlong getStaticLongArrayField(jobject obj, const char *name, int index);
-    jlong getStaticLongArrayField(jclass cls, const char *name, int index);
-    void setStaticLongArrayField(jobject obj, const char *name, jlongArray value);
-    void setStaticLongArrayField(jclass obj, const char *name, jlongArray value);
-    jboolean callStaticMethod(jclass cls, const char *method, const char *signature, ...);
-
-    JNIObject<jobject> getObjectArrayElement(jobjectArray array, int index);
-    JNIObject<jobject> getObjectArrayElement(jobject array, int index);
-    int getArrayLength(jarray array);
-    JNIObject<jobjectArray> newObjectArray(int num, const char *className, jobject val);
     JNIObject<jbyteArray> newByteArray(int num);
-    JNIObject<jintArray> newIntArray(int num);
-    JNIObject<jlongArray> newLongArray(int num);
-    JNIObject<jstring> newStringUTF(const char *utf);
-    void setObjectArrayElement(jobjectArray array, int index, jobject obj);
     void setByteArrayRegion(jbyteArray array, int from, int to, const jbyte *bytes);
-    void setIntArrayRegion(jintArray array, int from, int to, const jint *ints);
-    void setLongArrayRegion(jlongArray array, int from, int to, const jlong *longs);
-
-    jobject newGlobalRef(jobject obj);
-    void deleteGlobalRef(jobject obj);
 
 private:
     /* Jni wrappers */
-    friend class JNIObject<jobject>;
-    friend class JNIObject<jstring>;
-    friend class JNIObject<jobjectArray>;
-    friend class JNIObject<jclass>;
-    friend class JNIObject<jlongArray>;
     friend class JNIObject<jbyteArray>;
-    friend class JNIObject<jintArray>;
     jobject newLocalRef(jobject obj);
     void deleteLocalRef(jobject obj);
 };
 
 template<typename T>
 JNIObject<T>::JNIObject(JNIHelper &helper, T obj)
-    : mHelper(helper), mObj(obj)
+      : mHelper(helper), mObj(obj)
 { }
 
 template<typename T>
 JNIObject<T>::JNIObject(const JNIObject<T>& rhs)
-    : mHelper(rhs.mHelper), mObj(NULL)
+      : mHelper(rhs.mHelper), mObj(NULL)
 {
-    mObj = (T)mHelper.newLocalRef(rhs.mObj);
+      mObj = (T)mHelper.newLocalRef(rhs.mObj);
 }
 
 template<typename T>
 JNIObject<T>::~JNIObject() {
-    release();
+      release();
 }
 
 template<typename T>
 void JNIObject<T>::release()
 {
-    if (mObj != NULL) {
-        mHelper.deleteLocalRef(mObj);
-        mObj = NULL;
-    }
+      if (mObj != NULL) {
+          mHelper.deleteLocalRef(mObj);
+          mObj = NULL;
+      }
 }
 
 template<typename T>
 T JNIObject<T>::clone()
 {
-    return mHelper.newLocalRef(mObj);
+      return mHelper.newLocalRef(mObj);
 }
-
 }
 
 #define THROW(env, message)      (env).throwException(message, __LINE__)