Merge "wlan: Don't overwrite the channel configured in hostapd.conf"

softap/sdk/Android.mk

@@ -12,6 +12,10 @@ LOCAL_MODULE_TAGS := optional
 
 LOCAL_CFLAGS += -DSDK_VERSION=\"0.0.1.0\"
 
+ifeq ($(PLATFORM_VERSION),4.4)
+LOCAL_CFLAGS += -DANDROID_VERSION_KITKAT
+endif
+
 ifdef WIFI_DRIVER_MODULE_PATH
 LOCAL_CFLAGS += -DWIFI_DRIVER_MODULE_PATH=\"$(WIFI_DRIVER_MODULE_PATH)\"
 endif

softap/sdk/qsap_api.c

@@ -3094,6 +3094,7 @@ int qsapsetSoftap(int argc, char *argv[])
             return -1;
         }
     }
+#ifndef ANDROID_VERSION_KITKAT
     /** channel */
     rlen = RECV_BUF_LEN;
     if(argc > 5) {
@@ -3105,7 +3106,7 @@ int qsapsetSoftap(int argc, char *argv[])
             return -1;
         }
     }
-
+#endif
     /** Security */
     rlen = RECV_BUF_LEN;
     if(argc > 6) {