Handle exception in case of error in stopping bluetooth discovery

Change-Id: I5426479f3426c731cf7f94637807a5bab05db691
Signed-off-by: Anuj Kumar Singh <anujk.singh@samsung.com>

diff --git a/SettingBluetooth/SettingBluetooth/SettingBluetooth.cs b/SettingBluetooth/SettingBluetooth/SettingBluetooth.cs
index 82364695dabb6bf59049753c9dd060f8d62a8104..54cca7f392f92e4970d53e7a4116889c6583a3e0 100644 (file)
--- a/SettingBluetooth/SettingBluetooth/SettingBluetooth.cs
+++ b/SettingBluetooth/SettingBluetooth/SettingBluetooth.cs
@@ -65,9 +65,16 @@ namespace SettingBluetooth
         protected override void OnDestroy()
         {
             Log.Info(LogTag, "OnDestroy");
-            if (BtModel.IsScanning)
+            try
             {
-                BtModel.StopDiscovery();
+                if (BtModel.IsScanning)
+                {
+                    BtModel.StopDiscovery();
+                }
+            }
+            catch (Exception e)
+            {
+                Log.Error(SettingBluetooth.LogTag, "StopDiscovery failed: " + e.ToString());
             }
             base.OnDestroy();
         }

diff --git a/packaging/org.tizen.cssetting-bluetooth-1.0.0.rpk b/packaging/org.tizen.cssetting-bluetooth-1.0.0.rpk
index dad83b6762c230a3debcd1f5db61a6d20a8e9b78..0a35e66f38d7ae1f90d42c24398b1c8b4ce3ba90 100644 (file)
Binary files a/packaging/org.tizen.cssetting-bluetooth-1.0.0.rpk and b/packaging/org.tizen.cssetting-bluetooth-1.0.0.rpk differ