Merge "[connman]: Fixed Scan Issue" into tizen

diff --combined plugins/wifi.c
index 72eb64f,c0079b3..05eb47e
--- 1/plugins/wifi.c
--- 2/plugins/wifi.c
+++ b/plugins/wifi.c
@@@ -131,6 -131,7 +131,7 @@@ struct wifi_data 
  #if defined TIZEN_EXT
        int assoc_retry_count;
        struct connman_network *scan_pending_network;
+       bool allow_full_scan;
  #endif
  };
  
@@@ -144,6 -145,7 +145,7 @@@ static gboolean found_with_first_scan 
  static gboolean is_wifi_notifier_registered = false;
  #endif
  
+ 
  static GList *iface_list = NULL;
  
  static GList *pending_wifi_device = NULL;
@@@ -1319,6 -1321,11 +1321,11 @@@ static void scan_callback(int result, G
                connman_device_unref(device);
  
  #if defined TIZEN_EXT
+       if (wifi && wifi->allow_full_scan) {
+               DBG("Trigger Full Channel Scan");
+               throw_wifi_scan(device, scan_callback);
+               wifi->allow_full_scan = FALSE;
+       }
        if (wifi && wifi->scan_pending_network && result != -EIO) {
                network_connect(wifi->scan_pending_network);
                wifi->scan_pending_network = NULL;
@@@ -1928,6 -1935,13 +1935,13 @@@ static int wifi_scan(enum connman_servi
  
        connman_device_ref(device);
  
+ #if defined TIZEN_EXT
+       /*To allow the Full Scan after ssid based scan, set the flag here
+      It is required because Tizen does not use the ConnMan specific
+      backgroung Scan feature.Tizen has added the BG Scan feature in net-config
+      To sync with up ConnMan, we need to issue the Full Scan after SSID specific scan.*/
+        wifi->allow_full_scan = TRUE;
+ #endif
        reset_autoscan(device);
  
        ret = g_supplicant_interface_scan(wifi->interface, scan_params,
@@@ -2976,7 -2990,12 +2990,7 @@@ static void network_added(GSupplicantNe
  #endif
  
        if (wifi->hidden && ssid) {
 -#if defined TIZEN_EXT
 -              if (network_security(wifi->hidden->security) ==
 -                      network_security(security) &&
 -#else
                if (!g_strcmp0(wifi->hidden->security, security) &&
 -#endif
                                wifi->hidden->ssid_len == ssid_len &&
                                !memcmp(wifi->hidden->ssid, ssid, ssid_len)) {
                        connman_network_connect_hidden(network,