//
-// Open Service Platform
// Copyright (c) 2012 Samsung Electronics Co., Ltd.
//
// Licensed under the Apache License, Version 2.0 (the License);
provider = pEntry->provider;
oId = pEntry->operation;
- SysLog(NID_APP, "Legacy AppControl name (%ls, %ls).", provider.GetPointer(), oId.GetPointer());
+ SysLog(NID_APP, "Legacy AppControl(%ls, %ls).", provider.GetPointer(), oId.GetPointer());
}
}
provider = pEntry->provider;
oId = pEntry->operation;
- SysLog(NID_APP, "Original AppControl name (%ls, %ls).", provider.GetPointer(), oId.GetPointer());
+ SysLog(NID_APP, "Original AppControl(%ls, %ls).", provider.GetPointer(), oId.GetPointer());
}
}
// after acquring request number, pLib should be managed from the list, not CATCH
if (IsFailed(r))
{
- SetLastResult(E_SYSTEM);
_AppControlManager::GetInstance()->__inAppManager.RemoveItem(req);
- SysLog(NID_APP, "[E_SYSTEM] A system error has occurred with %s.", GetErrorMessage(r));
+ SysLog(NID_APP, "[%s] A system error has occurred.", GetErrorMessage(r));
- return E_SYSTEM;
+ return r;
}
_reqId = req;
// after acquring request number, pLib should be managed from the list, not CATCH
if (IsFailed(r))
{
- SetLastResult(E_SYSTEM);
_AppControlManager::GetInstance()->__inAppManager.RemoveItem(req);
- SysLog(NID_APP, "[E_SYSTEM] A system error has occurred with %s.", GetErrorMessage(r));
+ SysLog(NID_APP, "[%s] A system error has occurred.", GetErrorMessage(r));
- return E_SYSTEM;
+ return r;
}
_reqId = req;
String
_AppControlImpl::GetAppName(void)
{
- if ((_property & _APPCONTROL_PROPERTY_OSP) && _appName.IsEmpty())
+ if (_appName.IsEmpty())
{
- const AppId& appId = _path;
+ AppId appId = GetAppId();
+ AppId aliasAppId = _AppControlRegistry::GetInstance()->GetAliasAppId(appId);
+ if (!aliasAppId.IsEmpty())
+ {
+ appId = aliasAppId;
+ }
std::unique_ptr<PackageAppInfo> pInfo(_PackageManagerImpl::GetInstance()->GetPackageAppInfoN(appId));
-
if (pInfo.get())
{
+ SysLog(NID_APP, "PackageInfo of appId(%ls) exists", appId.GetPointer());
const String& name = pInfo->GetAppName();
if (name == L"_AppControl")
{
{
_appName = pInfo->GetAppDisplayName();
}
- SysLog(NID_APP, "Initializing AppName(%ls) for %ls.", _appName.GetPointer(), appId.GetPointer());
+ }
+ else
+ {
+ SysLog(NID_APP, "PackageInfo of appId(%ls) does not exist", appId.GetPointer());
}
}
IList*
_AppControlImpl::GetCategoryListN(void) const
{
- const AppId& appId = GetAppId();
+ AppId appId = GetAppId();
SysTryReturn(NID_APP, !appId.IsEmpty(), null, E_SYSTEM, "[E_SYSTEM] Empty appId.");
+ AppId aliasAppId = _AppControlRegistry::GetInstance()->GetAliasAppId(appId);
+ if (!aliasAppId.IsEmpty())
+ {
+ appId = aliasAppId;
+ }
+
SysLog(NID_APP, "Acquiring category for app %ls.", appId.GetPointer());
std::unique_ptr<PackageAppInfo> pAppInfo(_PackageManagerImpl::GetInstance()->GetPackageAppInfoN(appId));