From bbc9172d46ee9b5b683957b0ce70b47c5bb8d90e Mon Sep 17 00:00:00 2001 From: Duyoung Jang Date: Thu, 9 May 2013 11:49:06 +0900 Subject: [PATCH] Change log for secure Change-Id: I9c4b4c2b5d00772cc8d0cf08fbc69ee00e5c6969 Signed-off-by: Duyoung Jang --- src/app/package/FAppPkg_PackageAppInfoImpl.cpp | 11 ++++++----- src/app/package/FAppPkg_PackageManagerImpl.cpp | 6 +++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/app/package/FAppPkg_PackageAppInfoImpl.cpp b/src/app/package/FAppPkg_PackageAppInfoImpl.cpp index 2e7f9ca..a3475af 100755 --- a/src/app/package/FAppPkg_PackageAppInfoImpl.cpp +++ b/src/app/package/FAppPkg_PackageAppInfoImpl.cpp @@ -281,6 +281,10 @@ _PackageAppInfoImpl::GetAppFeature(const String& key) const SysTryReturn(NID_APP, pStmt, L"", E_SYSTEM, "CreateStatementN(%ls) failed. [%s]", query.GetPointer(), GetErrorMessage(GetLastResult())); std::unique_ptr< DbEnumerator > pEnum(_PackageManagerImpl::ExecuteStatementN(db, pStmt.get())); + if ((GetLastResult() == E_SUCCESS) && (pEnum == null)) + { + return L""; + } SysTryReturn(NID_APP, pEnum, L"", E_SYSTEM, "ExecuteStatementN() failed. [%s]", GetErrorMessage(GetLastResult())); while (pEnum->MoveNext() == E_SUCCESS) @@ -331,8 +335,6 @@ _PackageAppInfoImpl::Construct(const AppId& appId) res = pkgmgrinfo_appinfo_get_exec(__pAppInfoHandle, &pExePath); if (res == PMINFO_R_OK) { - SysLog(NID_APP, "pkgmgrinfo_appinfo_get_exec(): exe = [%s]", pExePath); - String exePath(pExePath); int startIndex = exePath.GetLength() - 1; int indexOf = 0; @@ -357,7 +359,6 @@ _PackageAppInfoImpl::Construct(const AppId& appId) res = pkgmgrinfo_appinfo_get_label(__pAppInfoHandle, &pDisplayName); if (res == PMINFO_R_OK) { - SysLog(NID_APP, "pkgmgrinfo_appinfo_get_label(): displayName = [%s]", pDisplayName); String displayName(pDisplayName); SetAppDisplayName(displayName); } @@ -402,7 +403,6 @@ _PackageAppInfoImpl::Construct(const AppId& appId) res = pkgmgrinfo_appinfo_is_mainapp(__pAppInfoHandle, &mainApp); if (res == PMINFO_R_OK) { - SysLog(NID_APP, "pkgmgrinfo_appinfo_is_mainapp(): mainApp = [%d]", mainApp); SetMainApp(mainApp); } else @@ -413,7 +413,6 @@ _PackageAppInfoImpl::Construct(const AppId& appId) res = pkgmgrinfo_appinfo_is_nodisplay(__pAppInfoHandle, &menuIconVisible); if (res == PMINFO_R_OK) { - SysLog(NID_APP, "pkgmgrinfo_appinfo_is_nodisplay(): menuIconVisible = [%d]", menuIconVisible); SetMenuIconVisible(!menuIconVisible); } else @@ -421,6 +420,8 @@ _PackageAppInfoImpl::Construct(const AppId& appId) SysLog(NID_APP, "pkgmgrinfo_appinfo_is_nodisplay() is failed. result = [%d]", res); } + SysLog(NID_APP, "exe = [%s], displayName = [%s], mainApp = [%d], menuIconVisible = [%d]", pExePath, pDisplayName, mainApp, menuIconVisible); + return E_SUCCESS; } diff --git a/src/app/package/FAppPkg_PackageManagerImpl.cpp b/src/app/package/FAppPkg_PackageManagerImpl.cpp index 17e645f..dd43f65 100755 --- a/src/app/package/FAppPkg_PackageManagerImpl.cpp +++ b/src/app/package/FAppPkg_PackageManagerImpl.cpp @@ -476,7 +476,7 @@ _PackageManagerImpl::UninstallPackage(const PackageId& packageId, IPackageUninst } res = pkgmgr_client_uninstall(__pRequestClient, pType, pPackageId.get(), PM_QUIET, UninstallationEventHandler, pListener); - SysLog(NID_APP, "pkgmgr_client_uninstall - req_id=[%d], package=[%s], type=[%s]", res, pPackageId.get(), pType); + SysLog(NID_APP, "pkgmgr_client_uninstall - req=[%d], package=[%s], type=[%s]", res, pPackageId.get(), pType); if(pPackageInfoHandle) { @@ -759,7 +759,7 @@ _PackageManagerImpl::GetPackageInfoFromFileN(const String& filePath) const _package_manager_pkg_detail_info_t* pPkgInfo = (_package_manager_pkg_detail_info_t*) pPkgmgrInfo; _PackageInfoImpl* pPackageInfoImpl = _PackageInfoImpl::GetInstance(pPackageInfo.get()); - SysLog(NID_APP, "id(%s), version(%s), label(%s), description(%s), author(%s), icon_size(%d), pkgname(%s)", pPkgInfo->pkgid, pPkgInfo->version, pPkgInfo->label, + SysLog(NID_APP, "package(%s), version(%s), label(%s), description(%s), author(%s), icon_size(%d), pkgname(%s)", pPkgInfo->pkgid, pPkgInfo->version, pPkgInfo->label, pPkgInfo->pkg_description, pPkgInfo->author, pPkgInfo->icon_size, pPkgInfo->pkg_name); pPackageInfoImpl->SetType(PACKAGE_TYPE_WGT); @@ -1683,7 +1683,7 @@ int _PackageManagerImpl::PackageEventHandler(int req_id, const char* pkg_type, const char* pkg_name, const char* key, const char* val, const void* pmsg, void* data) { - SysLog(NID_APP, "PackageEventHandler - req_id: %d, pkg_type: %s, pkg_name: %s, key: %s, val: %s", req_id, pkg_type, + SysLog(NID_APP, "PackageEventHandler - req: %d, pkg_type: %s, pkg_name: %s, key: %s, val: %s", req_id, pkg_type, pkg_name, key, val); PackageType type = PACKAGE_TYPE_TPK; -- 2.7.4