summaryrefslogtreecommitdiffstats
path: root/service/jni
diff options
context:
space:
mode:
authorxinhe <xinhe@google.com>2015-02-04 16:39:45 -0800
committerxin He <xinhe@google.com>2015-02-06 21:21:50 +0000
commit826282265badbd85c5386573fbced1755696fe83 (patch)
tree611c4648f045a4e4c1e7650f6ca7898142a59ac8 /service/jni
parent2b26ad17b41b6cc7c5663aa47a66239cf698794f (diff)
downloadandroid_frameworks_opt_net_wifi-826282265badbd85c5386573fbced1755696fe83.tar.gz
android_frameworks_opt_net_wifi-826282265badbd85c5386573fbced1755696fe83.tar.bz2
android_frameworks_opt_net_wifi-826282265badbd85c5386573fbced1755696fe83.zip
get channel list from driver for SoftAP channel selection
Instead of hard coding the available channel list, we should get channel list from driver Bug:19237543 Change-Id: Ibe1fbbdc39a6cf69a0b36cfb9c6b63025d0b914d
Diffstat (limited to 'service/jni')
-rw-r--r--service/jni/com_android_server_wifi_WifiNative.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/service/jni/com_android_server_wifi_WifiNative.cpp b/service/jni/com_android_server_wifi_WifiNative.cpp
index cdd07271f..864b88d51 100644
--- a/service/jni/com_android_server_wifi_WifiNative.cpp
+++ b/service/jni/com_android_server_wifi_WifiNative.cpp
@@ -249,7 +249,6 @@ int set_iface_flags(const char *ifname, int dev_up) {
static jboolean android_net_wifi_startHal(JNIEnv* env, jclass cls) {
wifi_handle halHandle = getWifiHandle(env, cls);
-
if (halHandle == NULL) {
int ret = set_iface_flags("wlan0", 1);
if(ret != 0) {
@@ -265,7 +264,7 @@ static jboolean android_net_wifi_startHal(JNIEnv* env, jclass cls) {
ALOGD("halHandle = %p, mVM = %p, mCls = %p", halHandle, mVM, mCls);
return res == WIFI_SUCCESS;
} else {
- return true;
+ return (set_iface_flags("wlan0", 1) == 0);
}
}