From 2addd175cc9a81a5c26a21fce30b26cf0458c6fa Mon Sep 17 00:00:00 2001
From: Mahesh A Saptasagar <msapta@codeaurora.org>
Date: Tue, 3 Dec 2013 16:35:15 +0530
Subject: [PATCH] wlan: Don't overwrite the channel configured in hostapd.conf

When SAP is turned on through GUI, hostapd.conf file
will be overwritten by the framework parameters.Since
in Kit-Kat framework,channel value is hard coded to 6,
same is getting over written whenever we turn on SAP
through GUI, this will cause SAP to come up always on
channel 6.
To mitigate this issue, avoid overwriting the channel
parameter in hostap.conf file by ignoring the channel
parameter from the framework.

Change-Id: I4d87cf70868ad705f63211b2bd10ac2a67646d09
CRs-Fixed: 584112
---
 softap/sdk/Android.mk | 4 ++++
 softap/sdk/qsap_api.c | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/softap/sdk/Android.mk b/softap/sdk/Android.mk
index fc94104..1f0f380 100644
--- a/softap/sdk/Android.mk
+++ b/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
diff --git a/softap/sdk/qsap_api.c b/softap/sdk/qsap_api.c
index 5f730cd..fc9f564 100644
--- a/softap/sdk/qsap_api.c
+++ b/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) {