Merge "Update deprecated libprivilege-control API functions." into tizen

[platform/framework/native/appfw.git] / src / app / FAppAppManager.cpp

diff --git a/src/app/FAppAppManager.cpp b/src/app/FAppAppManager.cpp
index 63ead16..a3fcc04 100644 (file)
--- a/src/app/FAppAppManager.cpp
+++ b/src/app/FAppAppManager.cpp
@@ -76,7 +76,11 @@ AppManager::Construct(void)
        SysTryReturnResult(NID_APP, __pAppManagerImpl != null, E_OUT_OF_MEMORY, "");
 
        r = __pAppManagerImpl->Construct();
-       SysTryCatch(NID_APP, !IsFailed(r), , r, "[%s] Propagating.", GetErrorMessage(r));
+       if (IsFailed(r))
+       {
+               SysPropagate(NID_APP, r);
+               goto CATCH;
+       }
 
        return r;
 
@@ -150,8 +154,7 @@ AppManager::GetAppSharedPath(const AppId& appId)
        String sharedPath;
 
        result r = _AppManagerImpl::GetAppRootPath(appId, sharedPath);
-       SysTryReturn(NID_APP, !IsFailed(r), sharedPath, r, "[%s] Propagating to caller...",
-                       GetErrorMessage(r));
+       SysTryReturn(NID_APP, !IsFailed(r), sharedPath, r, "[%s] Propagating to caller...", GetErrorMessage(r));
 
        sharedPath.Append(L"shared/");
 
@@ -370,4 +373,22 @@ AppManager::GetActiveApp(AppId& appId)
        return __pAppManagerImpl->GetActiveApp(appId);
 }
 
+bool 
+AppManager::IsUserPreferredAppForAppControlResolution(const AppId& appId) const
+{
+       SysAssertf(__pAppManagerImpl != null, "Not constructed properly by platform.");
+       SysTryReturn(NID_APP, _Aul::IsInstalled(appId) == true, false, E_APP_NOT_INSTALLED, "The application(%ls) is not installed.", appId.GetPointer());
+
+       return __pAppManagerImpl->IsUserPreferredAppForAppControlResolution(appId);
+}
+
+result 
+AppManager::ClearUserPreferenceForAppControlResolution(const AppId& appId)
+{
+       SysAssertf(__pAppManagerImpl != null, "Not constructed properly by platform.");
+       SysTryReturnResult(NID_APP, _Aul::IsInstalled(appId) == true, E_APP_NOT_INSTALLED, "The application(%ls) is not installed.", appId.GetPointer());
+
+       return __pAppManagerImpl->ClearUserPreferenceForAppControlResolution(appId);
+}
+
 }} // Tizen::App