From: Young Ik Cho <youngik.cho@samsung.com>
Date: Mon, 28 Oct 2013 03:13:49 +0000 (+0900)
Subject: remove default app selection logic
X-Git-Tag: submit/tizen/20131210.080830^2^2~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5ff3675619b47384b6d9b20861d85a996d194b69;p=platform%2Fframework%2Fnative%2Fappfw.git

remove default app selection logic

Change-Id: I2baa004c93aa2f51b77c4060e291b1ce9c4d57c6
Signed-off-by: Young Ik Cho <youngik.cho@samsung.com>
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 99bad42..1d9fa9b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,11 +40,6 @@ INSTALL(DIRECTORY ${LIBRARY_OUTPUT_PATH}/ DESTINATION lib/osp
 		PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
                     GROUP_EXECUTE GROUP_READ
                     WORLD_EXECUTE WORLD_READ)
-INSTALL(DIRECTORY ${LIBRARY_OUTPUT_PATH}/ DESTINATION lib/osp
-		FILES_MATCHING PATTERN "libosp-newlib.so*"
-		PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
-                    GROUP_EXECUTE GROUP_READ
-                    WORLD_EXECUTE WORLD_READ)
 INSTALL(DIRECTORY ${LIBRARY_OUTPUT_PATH}/ DESTINATION lib/osp-server
 		FILES_MATCHING PATTERN "libosp-appfw-server.so*"
 		PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
diff --git a/packaging/osp-appfw.spec b/packaging/osp-appfw.spec
index 3a6ee82..8d447b4 100644
--- a/packaging/osp-appfw.spec
+++ b/packaging/osp-appfw.spec
@@ -72,7 +72,7 @@ BuildRequires:  capi-security-privilege-manager-devel
 BuildRequires:  boost-devel
 BuildRequires:  gettext-tools
 BuildRequires:  pkgconfig(security-server)
-BuildRequires:  pkgconfig(appinfo) >= 0.1.0
+BuildRequires:  pkgconfig(appinfo) >= 0.1.2
 
 # runtime requires
 Requires: capi-appfw-application
@@ -83,7 +83,7 @@ Requires: capi-system-runtime-info
 Requires: capi-security-privilege-manager
 Requires: chromium
 Requires: message-port
-Requires: osp-env-config >= 1.2.2.1
+Requires: osp-env-config
 Requires: sqlite
 Requires: iniparser
 
diff --git a/src/app/FApp_AppInfo.cpp b/src/app/FApp_AppInfo.cpp
index b83a027..bb8d05a 100644
--- a/src/app/FApp_AppInfo.cpp
+++ b/src/app/FApp_AppInfo.cpp
@@ -37,6 +37,7 @@
 #include <FBase_StringConverter.h>
 
 #include "FAppPkg_PackageInfoImpl.h"
+#include "FApp_Aul.h"
 #include "FApp_AppInfo.h"
 
 using namespace Tizen::App::Package;
@@ -143,17 +144,21 @@ _AppInfo::Construct(void)
 	const char* pPackageId = appinfo_get_packageid();
 	const char* pExecName = appinfo_get_execname();
 
-
 	if (strncmp(pExecName, SUBMODE_NAME, strlen(SUBMODE_NAME)) == 0)
 	{
 		SysLog(NID_APP, "Handling for submode.");
-		const String& name = _PackageManagerImpl::GetInstance()->GetDefaultAppExecutableName(String(pPackageId));
-
-		__isSubMode = true;
 
-		std::unique_ptr<char[]> pActualExec(_StringConverter::CopyToCharArrayN(name));
-		appinfo_update_submode_execname_and_appid(pActualExec.get());
-		SysLog(NID_APP, "Executable name is changed to %s.", pActualExec.get());
+		const char* pAppId = appinfo_get_appid();
+		const String& mainId = _Aul::GetMainAppId(pAppId);
+		if (!mainId.IsEmpty())
+		{
+			std::unique_ptr<char[]> pMainId(_StringConverter::CopyToCharArrayN(mainId));
+			appinfo_update_submode_appid(pMainId.get());
+		
+			__isSubMode = true;
+		
+			SysLog(NID_APP, "Executable name is changed to %s.", pMainId.get());
+		}
 	}
 
 	result r = E_SUCCESS;