summaryrefslogtreecommitdiffstats
path: root/service/jni
diff options
context:
space:
mode:
authorVinit Deshpande <vinitd@google.com>2015-06-02 13:49:45 -0700
committerVinit Deshpande <vinitd@google.com>2015-06-02 13:49:45 -0700
commitf72f48afc909bd4b7371559aa034054da979942d (patch)
tree8b539e1d857f888dcf2996cbf3068609b2de8e0a /service/jni
parent6390090cff1ce03d51cf32a793b1431554817ca8 (diff)
parent6dd83f1bf785fd06609b7fe717b5b4d5f17c12c0 (diff)
downloadandroid_frameworks_opt_net_wifi-f72f48afc909bd4b7371559aa034054da979942d.tar.gz
android_frameworks_opt_net_wifi-f72f48afc909bd4b7371559aa034054da979942d.tar.bz2
android_frameworks_opt_net_wifi-f72f48afc909bd4b7371559aa034054da979942d.zip
am 22fd854..6dd83f1 from mirror-m-wireless-internal-release
6dd83f1 Merge "fix handling of command for bssid hot list" into m-wireless-dev a63da80 fix handling of command for bssid hot list b090f62 make sure unblacklist thresholds are initialized Bug:21161557 4c94fc6 Wifi: Disable PNO (if enabled) only when the scan is allowed to trigger be2981a fix enabling autojoin offload based on tx/rx counters a3e4c84 Move Halutil to vendor/google_testing/comms Change-Id: I9663436ad92094b1cde0e00d217b1fd9ca728351
Diffstat (limited to 'service/jni')
-rw-r--r--service/jni/com_android_server_wifi_WifiNative.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/service/jni/com_android_server_wifi_WifiNative.cpp b/service/jni/com_android_server_wifi_WifiNative.cpp
index 1e93b1700..d36b5f16b 100644
--- a/service/jni/com_android_server_wifi_WifiNative.cpp
+++ b/service/jni/com_android_server_wifi_WifiNative.cpp
@@ -2063,6 +2063,7 @@ static jboolean android_net_wifi_setSsidWhitelist(
}
memcpy(ssids[i].ssid, ssid, slen);
+ num_ssids++;
ALOGD("SSID white list: added ssid %s", ssid);
}
}