Update for getting appname and category list

Change-Id: I6f84a840f85d229befbae311380ff0fccfaac84a
Signed-off-by: Jaesung Ku <jaesung.ku@samsung.com>

diff --git a/src/app/FApp_AppControlImpl.cpp b/src/app/FApp_AppControlImpl.cpp
index a2a036e..6c0ba57 100755 (executable)
--- a/src/app/FApp_AppControlImpl.cpp
+++ b/src/app/FApp_AppControlImpl.cpp
@@ -875,14 +875,19 @@ _AppControlImpl::Stop(void)
 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")
                        {
@@ -907,7 +912,10 @@ _AppControlImpl::GetAppName(void)
                        {
                                _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());
                }
        }
 
@@ -935,9 +943,15 @@ _AppControlImpl::GetOperationId(void) const
 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));