Change deletion order of FrameworkFactory

[platform/core/uifw/dali-adaptor.git] / dali / internal / adaptor / android / framework-factory-android.cpp

diff --git a/dali/internal/adaptor/android/framework-factory-android.cpp b/dali/internal/adaptor/android/framework-factory-android.cpp
index 29acd0b..70b74f8 100644 (file)
--- a/dali/internal/adaptor/android/framework-factory-android.cpp
+++ b/dali/internal/adaptor/android/framework-factory-android.cpp
@@ -28,20 +28,31 @@ namespace Internal
 {
 namespace Adaptor
 {
+FrameworkFactory* gFrameworkFactory = nullptr;
+
+FrameworkFactoryAndroid::FrameworkFactoryAndroid()
+{
+  gFrameworkFactory = this;
+}
+
+FrameworkFactoryAndroid::~FrameworkFactoryAndroid()
+{
+  gFrameworkFactory = nullptr;
+}
+
 std::unique_ptr<Framework> FrameworkFactoryAndroid::CreateFramework(FrameworkBackend backend, Framework::Observer& observer, Framework::TaskObserver& taskObserver, int* argc, char*** argv, Framework::Type type, bool useUiThread)
 {
   return Utils::MakeUnique<FrameworkAndroid>(observer, taskObserver, argc, argv, type, useUiThread);
 }
 
-FrameworkFactory* GetFrameworkFactory()
+FrameworkFactory* CreateFrameworkFactory()
 {
-  static std::unique_ptr<FrameworkFactory> frameworkFactory = nullptr;
+  return (new FrameworkFactoryAndroid());
+}
 
-  if(!frameworkFactory)
-  {
-    frameworkFactory = Utils::MakeUnique<FrameworkFactoryAndroid>();
-  }
-  return frameworkFactory.get();
+FrameworkFactory* GetFrameworkFactory()
+{
+  return gFrameworkFactory;
 }
 
 } // namespace Adaptor