Merge "Fix the defect of calculating time" into tizen_2.2

diff --git a/packaging/osp-appfw.spec b/packaging/osp-appfw.spec
index e5ec007..0fde857 100755 (executable)
--- a/packaging/osp-appfw.spec
+++ b/packaging/osp-appfw.spec
@@ -3,7 +3,7 @@
 
 Name:       osp-appfw
 Summary:    The App Framework library of OSP 
-Version:    1.2.1.0
+Version:    1.2.2.0
 Release:    1
 Group:      TO_BE/FILLED_IN
 License:    Apache License, Version 2.0 or Flora

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 615c26a..e136c33 100755 (executable)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -42,6 +42,7 @@ pkg_check_modules(pkgs REQUIRED
        capi-system-system-settings
        capi-system-media-key
        capi-network-bluetooth
+       capi-system-info
        security-server
 )
 

diff --git a/src/app/FApp_AppControlManager.cpp b/src/app/FApp_AppControlManager.cpp
index 1f7f742..3038459 100644 (file)
--- a/src/app/FApp_AppControlManager.cpp
+++ b/src/app/FApp_AppControlManager.cpp
@@ -250,7 +250,7 @@ _AppControlManager::InvokeAppControlCompleteListener(IAppControlResponseListener
 {
        listener.OnAppControlCompleteResponseReceived(appId, op, res, pExtraData);
 
-       _AppImpl::GetInstance()->RaiseWindow();
+       //_AppImpl::GetInstance()->RaiseWindow();
 
        SysLog(NID_APP, "AppControl response finished.");
 }
@@ -261,7 +261,7 @@ _AppControlManager::InvokeLegacyAppControlCompleteListener(IAppControlEventListe
 {
        listener.OnAppControlCompleted(appId, op, pList);
 
-       _AppImpl::GetInstance()->RaiseWindow();
+       //_AppImpl::GetInstance()->RaiseWindow();
        SysLog(NID_APP, "Legacy AppControl response finished.");
 }
 

diff --git a/src/system/FSysSystemInfo.cpp b/src/system/FSysSystemInfo.cpp
index c147606..d6aa6ff 100644 (file)
--- a/src/system/FSysSystemInfo.cpp
+++ b/src/system/FSysSystemInfo.cpp
@@ -176,8 +176,6 @@ SystemInfo::GetImei(String& imei)
        SysTryReturnResult(NID_SYS, *pResult == _SYSTEM_RESULT_OK, E_SYSTEM, "It is failed to get IMEI value.");
 
        imei = *pImei;
-       responseMessage.RemoveAll(true);
-
        return r;
 }
 

diff --git a/src/system/FSys_SystemInfoImpl.cpp b/src/system/FSys_SystemInfoImpl.cpp
index 1909a85..2b586c2 100644 (file)
--- a/src/system/FSys_SystemInfoImpl.cpp
+++ b/src/system/FSys_SystemInfoImpl.cpp
@@ -21,6 +21,7 @@
 #include <unique_ptr.h>
 #include <unistd.h>
 
+#include <system_info.h>
 #include <ITapiModem.h>
 
 #include <FBaseBoolean.h>
@@ -569,13 +570,32 @@ _SystemInfoImpl::GetSysInfo(const String& key, bool& value)
                return E_SUCCESS;
        }
 
-       r = GetFromRegistry(tizenKey, value);
-       if(r != E_SUCCESS)
+       if(key == L"http://tizen.org/feature/input.keys.menu")
        {
-               _SystemClient* pSystemClient = _SystemClient::GetInstance();
-               r = pSystemClient->GetValue(tizenKey, value);
+               bool supported = false;
+               int ret = system_info_get_platform_bool("tizen.org/feature/input.keys.menu", &supported);
+               SysTryReturnResult(NID_SYS, ret == 0, E_SYSTEM, "It is failed to get system information from configration file.");
+               value = supported;
+               r = E_SUCCESS;
+       }
+       else if(key == L"http://tizen.org/feature/input.keys.back")
+       {
+               bool supported = false;
+               int ret = system_info_get_platform_bool("tizen.org/feature/input.keys.back", &supported);
+               SysTryReturnResult(NID_SYS, ret == 0, E_SYSTEM, "It is failed to get system information from configration file.");
+               value = supported;
+               r = E_SUCCESS;
+       }
+       else
+       {
+               r = GetFromRegistry(tizenKey, value);
+               if(r != E_SUCCESS)
+               {
+                       _SystemClient* pSystemClient = _SystemClient::GetInstance();
+                       r = pSystemClient->GetValue(tizenKey, value);
+               }
+               SysTryReturnResult(NID_SYS, r == E_SUCCESS, E_OBJ_NOT_FOUND, "It is failed to get the key[%ls]", tizenKey.GetPointer());
        }
-       SysTryReturnResult(NID_SYS, r == E_SUCCESS, E_OBJ_NOT_FOUND, "It is failed to get the key[%ls]", tizenKey.GetPointer());
 
        if(r == E_SUCCESS)
        {
@@ -708,7 +728,6 @@ _SystemInfoImpl::GetImei(String& imei)
        SysTryReturnResult(NID_SYS, *pResult == _SYSTEM_RESULT_OK, E_SYSTEM, "It is failed to get IMEI value.");
 
        imei = *pImei;
-       responseMessage.RemoveAll(true);
        return r;
 }