Fix wifi activate/deactivate issue when wifi_direct is deactivated using API

Disable wpa_supplicant Start/Stop in wifi-direct-manager
because net-config has ownership to Start/Stop wpa_supplicant.

Change-Id: I0e1319286fc669b5a382f2a41bcc3b6822bf2d32
Signed-off-by: Nishant Chaprana <n.chaprana@samsung.com>

diff --git a/files/p2p_supp.sh.in b/files/p2p_supp.sh.in
index bbe65e7..1e65f88 100644 (file)
--- a/files/p2p_supp.sh.in
+++ b/files/p2p_supp.sh.in
@@ -10,15 +10,15 @@ start()
 
        ## For Hawk-P Platform, Hardware model is Samsung
        if [ $HARDWARE_MODEL = "Samsung" ];then
-               @SBIN_DIR@/wpa_supplicant -t -B -ddd -Dnl80211 -ip2p0 -c@TZ_SYS_ETC@/wpa_supplicant/wpa_supplicant.conf -g@TZ_SYS_RUN@/wpa_global  -f/opt/usr/data/network/wpa_supplicant.log
+#              @SBIN_DIR@/wpa_supplicant -t -B -ddd -Dnl80211 -ip2p0 -c@TZ_SYS_ETC@/wpa_supplicant/wpa_supplicant.conf -g@TZ_SYS_RUN@/wpa_global  -f/opt/usr/data/network/wpa_supplicant.log
         else
-               @BIN_DIR@/wpa_supplicant -t -B -ddd -O @TZ_SYS_RUN@/wpa_supplicant-Dnl80211 -iwlan0 -c@TZ_SYS_ETC@/wpa_supplicant/wpa_supplicant.conf -f/opt/usr/data/network/wpa_supplicant.log
+#              @BIN_DIR@/wpa_supplicant -t -B -ddd -O @TZ_SYS_RUN@/wpa_supplicant-Dnl80211 -iwlan0 -c@TZ_SYS_ETC@/wpa_supplicant/wpa_supplicant.conf -f/opt/usr/data/network/wpa_supplicant.log
        fi
  }
 
 start_p2p0()
 {
-       @BIN_DIR@/wpa_supplicant -t -B -ddd -Dnl80211 -ip2p0 -c@TZ_SYS_ETC@/wpa_supplicant/wpa_supplicant.conf -f/opt/usr/data/network/wpa_supplicant.log
+#      @BIN_DIR@/wpa_supplicant -t -B -ddd -Dnl80211 -ip2p0 -c@TZ_SYS_ETC@/wpa_supplicant/wpa_supplicant.conf -f/opt/usr/data/network/wpa_supplicant.log
 }
 
 start_dbus()
@@ -27,7 +27,7 @@ start_dbus()
        run=`@BIN_DIR@/ps -eo comm| @BIN_DIR@/grep ${program}`
        if [ "X${run}" == "X" ]; then
                echo "${program} is not running"
-               @BIN_DIR@/wpa_supplicant -t -B -u -ddd -O @TZ_SYS_RUN@/wpa_supplicant -g/var/run/wpa_global -K -f/opt/usr/data/network/wpa_supplicant.log
+#              @BIN_DIR@/wpa_supplicant -t -B -u -ddd -O @TZ_SYS_RUN@/wpa_supplicant -g/var/run/wpa_global -K -f/opt/usr/data/network/wpa_supplicant.log
        else
                echo "${program} is already running"
        fi
@@ -35,7 +35,7 @@ start_dbus()
 
 stop()
 {
-       @BIN_DIR@/pkill -x wpa_supplicant
+#      @BIN_DIR@/pkill -x wpa_supplicant
 }
 
 case $1 in

diff --git a/packaging/wifi-direct-manager.spec b/packaging/wifi-direct-manager.spec
index 75d51f2..eaa939a 100644 (file)
--- a/packaging/wifi-direct-manager.spec
+++ b/packaging/wifi-direct-manager.spec
@@ -6,7 +6,7 @@
 
 Name:          wifi-direct-manager
 Summary:       Wi-Fi Direct manger
-Version:       1.3.3
+Version:       1.3.4
 Release:       1
 Group:      Network & Connectivity/Wireless
 License:    Apache-2.0