diff options
| author | Ningyuan Wang <nywang@google.com> | 2016-10-11 21:08:29 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-10-11 21:08:29 +0000 |
| commit | 2b86d7b17bec5a4b8e84d2925902ad8569eeb25a (patch) | |
| tree | 9408a9b11de134ae4bd3c6c7f81c00abc9e8deae /service | |
| parent | 7a0ebff1ffc14efd80807158080d3c94ca4b3276 (diff) | |
| parent | 5775f4a93435c479c5f8a2bf40ebb0ee0079f76a (diff) | |
resolve merge conflicts of 849c5c7 to mnc-dev am: 29a2baf319 am: 583dc0e86d am: e61906f92c am: 8851f93e19 am: 2a9a3a9304
am: 5775f4a934
Change-Id: Ibd37337e01f52a774db25b929f081b53ed52ca04
Diffstat (limited to 'service')
| -rw-r--r-- | service/jni/com_android_server_wifi_WifiNative.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/service/jni/com_android_server_wifi_WifiNative.cpp b/service/jni/com_android_server_wifi_WifiNative.cpp index d432982c9..17e469358 100644 --- a/service/jni/com_android_server_wifi_WifiNative.cpp +++ b/service/jni/com_android_server_wifi_WifiNative.cpp @@ -709,6 +709,13 @@ static jboolean android_net_wifi_setHotlist( 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); |