Merge "Fix crash caused by decryption response delay" into tizen

[platform/upstream/connman.git] / src / device.c

diff --git a/src/device.c b/src/device.c
index 1e3924b..da86084 100755 (executable)
--- a/src/device.c
+++ b/src/device.c
@@ -388,6 +388,10 @@ static void remove_device(struct connman_device *device)
        if (device->driver->remove)
                device->driver->remove(device);
 
+#if defined TIZEN_EXT
+       __connman_technology_notify_device_detected_by_device(device, "", false);
+#endif
+
        device->driver = NULL;
 }
 
@@ -883,7 +887,7 @@ const char *connman_device_get_last_connected_ident(struct connman_device *devic
 }
 #endif
 
-#if defined TIZEN_EXT && defined TIZEN_EXT_INS
+#if defined TIZEN_EXT
 void connman_device_save_last_user_selection(struct connman_device *device)
 {
        GKeyFile *keyfile;
@@ -1017,7 +1021,7 @@ void connman_device_load_last_connected(struct connman_device *device)
 
        g_key_file_free(keyfile);
 }
-#endif /* defined TIZEN_EXT && defined TIZEN_EXT_INS */
+#endif /* defined TIZEN_EXT */
 
 static void mark_network_available(gpointer key, gpointer value,
                                                        gpointer user_data)
@@ -2062,10 +2066,12 @@ struct connman_device *connman_device_create_from_index(int index)
 
        connman_device_set_index(device, index);
        connman_device_set_interface(device, devname);
-#if defined TIZEN_EXT && defined TIZEN_EXT_INS
-       connman_device_load_last_connected(device);
-       connman_device_load_last_user_selection(device);
-#endif /* defined TIZEN_EXT && defined TIZEN_EXT_INS */
+#if defined TIZEN_EXT
+       if (TIZEN_INS_ENABLED) {
+               connman_device_load_last_connected(device);
+               connman_device_load_last_user_selection(device);
+       }
+#endif /* defined TIZEN_EXT */
 
        if (ident) {
                connman_device_set_ident(device, ident);