X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fadaptor%2Fandroid%2Fandroid-framework-impl.cpp;h=c83265e0b007430857dbbff7e9d1c3924bca6017;hb=d8121b9835bf88413058b806942d2e9aacd92703;hp=70afaadfc7eef6b5278b86d8d7b25e00d5d30313;hpb=54de04b8698bcafee7f8dc623d19a30fc006de0b;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/dali/internal/adaptor/android/android-framework-impl.cpp b/dali/internal/adaptor/android/android-framework-impl.cpp
index 70afaad..c83265e 100644
--- a/dali/internal/adaptor/android/android-framework-impl.cpp
+++ b/dali/internal/adaptor/android/android-framework-impl.cpp
@@ -35,11 +35,19 @@ AndroidFramework* gAndroidFramework = nullptr; // raw specific pointer to allow
 Dali::Integration::AndroidFramework& AndroidFramework::New()
 {
   Dali::Integration::AndroidFramework* androidFramework = new Dali::Integration::AndroidFramework;
-  AndroidFramework* impl = new AndroidFramework( *androidFramework );
+  AndroidFramework* impl = new AndroidFramework( androidFramework );
   androidFramework->mImpl = impl;
   return *androidFramework;
 }
 
+void AndroidFramework::Delete()
+{
+  DALI_ASSERT_ALWAYS( gAndroidFramework != nullptr && "Cannot delete already deleted AndroidFramework." );
+
+  delete gAndroidFramework->mAndroidFramework;
+  gAndroidFramework = nullptr;
+}
+
 void AndroidFramework::SetNativeApplication( android_app* application )
 {
   mNativeApplication = application;
@@ -70,6 +78,16 @@ AAssetManager* AndroidFramework::GetApplicationAssets() const
   return mAssets;
 }
 
+void AndroidFramework::SetInternalDataPath( const std::string& path )
+{
+  mInternalDataPath = path;
+}
+
+std::string AndroidFramework::GetInternalDataPath() const
+{
+  return mInternalDataPath;
+}
+
 void AndroidFramework::SetApplicationConfiguration( AConfiguration* configuration )
 {
   mConfiguration = configuration;
@@ -119,10 +137,10 @@ Dali::Integration::AndroidFramework& AndroidFramework::Get()
 {
   DALI_ASSERT_ALWAYS( gAndroidFramework != nullptr && "AndroidFramework not instantiated" );
 
-  return gAndroidFramework->mAndroidFramework;
+  return *gAndroidFramework->mAndroidFramework;
 }
 
-AndroidFramework::AndroidFramework( Dali::Integration::AndroidFramework& androidFramework )
+AndroidFramework::AndroidFramework( Dali::Integration::AndroidFramework* androidFramework )
  : mAndroidFramework( androidFramework ),
    mFramework( nullptr ),
    mNativeApplication( nullptr ),