removed redundant code

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

diff --git a/src/app/FApp_AppControlImpl.cpp b/src/app/FApp_AppControlImpl.cpp
index b51f12c..899c9ea 100644 (file)
--- a/src/app/FApp_AppControlImpl.cpp
+++ b/src/app/FApp_AppControlImpl.cpp
@@ -447,44 +447,23 @@ _AppControlImpl::GetAppName(void) const
        if (_appName.IsEmpty())
        {
                AppId appId = GetAppId();
-               AppId aliasAppId = _AppControlRegistry::GetInstance()->GetAliasAppId(appId);
+               const AppId& aliasAppId = _AppControlRegistry::GetInstance()->GetAliasAppId(appId);
                if (!aliasAppId.IsEmpty())
                {
                        appId = aliasAppId;
                }
 
+               appId = _Aul::GetRealAppId(appId);
+
                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 == String(SUBMODE_NAME))
-                       {
-                               // workaround for special case: requery with actual appId
-                               const PackageId& packageId = _PackageManagerImpl::GetPackageIdByAppId(appId);
-                               const String& defaultName = _PackageManagerImpl::GetInstance()->GetDefaultAppExecutableName(packageId);
-
-                               const String& convertedAppId = packageId + L'.' + defaultName;
-
-                               std::unique_ptr<PackageAppInfo> pNewInfo(_PackageManagerImpl::GetInstance()->GetPackageAppInfoN(convertedAppId));
-
-                               if (pNewInfo.get())
-                               {
-                                       _appName = pNewInfo->GetAppDisplayName();
-                               }
-                               else
-                               {
-                                       SysLog(NID_APP, "No default applicaiton information, possible database error.");
-                               }
-                       }
-                       else
-                       {
-                               _appName = pInfo->GetAppDisplayName();
-                       }
+                       SysLog(NID_APP, "PackageInfo of [%ls] exists.", appId.GetPointer());
+                       _appName = pInfo->GetAppDisplayName();
                }
                else
                {
-                       SysLog(NID_APP, "PackageInfo of appId(%ls) does not exist", appId.GetPointer());
+                       SysLog(NID_APP, "PackageInfo of [%ls] does not exist.", appId.GetPointer());
                }
        }