Revert "[Tizen] atspi: disable atspi using environment variable"

[platform/core/uifw/dali-adaptor.git] / dali / internal / accessibility / bridge / bridge-impl.cpp

diff --git a/dali/internal/accessibility/bridge/bridge-impl.cpp b/dali/internal/accessibility/bridge/bridge-impl.cpp
index f76a9b4..b7b026f 100644 (file)
--- a/dali/internal/accessibility/bridge/bridge-impl.cpp
+++ b/dali/internal/accessibility/bridge/bridge-impl.cpp
@@ -31,6 +31,7 @@
 #include <dali/internal/accessibility/bridge/bridge-object.h>
 #include <dali/internal/accessibility/bridge/bridge-text.h>
 #include <dali/internal/accessibility/bridge/bridge-value.h>
+#include <dali/internal/accessibility/bridge/dummy-atspi.h>
 
 using namespace Dali::Accessibility;
 
@@ -316,8 +317,21 @@ public:
   }
 };
 
+static Bridge* CreateBridge()
+{
+  try
+  {
+    return new BridgeImpl;
+  }
+  catch (const std::exception&)
+  {
+    DALI_LOG_ERROR("Failed to initialize AT-SPI bridge");
+    return Dali::Accessibility::DummyBridge::GetInstance();
+  }
+}
+
 Bridge* Bridge::GetCurrentBridge()
 {
-  static BridgeImpl* bridge = new BridgeImpl;
+  static Bridge* bridge = CreateBridge();
   return bridge;
 }