Merge branch 'tizen_2.1' of ssh://tizendev.org:29418/framework/osp/appfw into tizen_2.1

Change-Id: Ifb343fd8699f7868815f19bdc30a9ba8e2ba1457

diff --combined src/app/package/FAppPkg_PackageInfoImpl.cpp
index ae76365,74c527d..2ddfbc0
--- 1/src/app/package/FAppPkg_PackageInfoImpl.cpp
--- 2/src/app/package/FAppPkg_PackageInfoImpl.cpp
+++ b/src/app/package/FAppPkg_PackageInfoImpl.cpp
@@@ -364,7 -364,7 +364,7 @@@ _PackageInfoImpl::GetPackageAppInfoN(co
                res = pkgmgrinfo_appinfo_get_appinfo(pAppId.get(), &appInfoHandle);
                if (res == 0)
                {
-                       SysLog(NID_APP, "pkgmgrinfo_appinfo_get_appinfo(): appId = [%s]", pAppId.get());
+                       SysLog(NID_APP, "pkgmgrinfo_appinfo_get_appinfo(): app = [%s]", pAppId.get());
  
                        PackageAppInfo* pPackageAppInfo = new (std::nothrow) PackageAppInfo;
                        SysTryReturn(NID_APP, pPackageAppInfo != null, 0, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Insufficient memory");
@@@ -450,7 -450,7 +450,7 @@@ _PackageInfoImpl::GetPackageAppInfo(con
        res = pkgmgrinfo_appinfo_get_appid(handle, &pAppId);
        if (res == 0)
        {
-               SysLog(NID_APP, "pkgmgrinfo_appinfo_get_appid(): appId = [%s]", pAppId);
+               SysLog(NID_APP, "pkgmgrinfo_appinfo_get_appid(): app = [%s]", pAppId);
                pPackageAppInfoImpl->Construct(pAppId);
        }
        else
@@@ -468,33 -468,25 +468,33 @@@ _PackageInfoImpl::GetPrivilegeListN(voi
  
        result r = E_SUCCESS;
  
 -      ArrayList* pPrivilegeList = new (std::nothrow) ArrayList;
 +      std::unique_ptr< ArrayList > pPrivilegeList(new (std::nothrow) ArrayList);
        SysTryReturn(NID_APP, pPrivilegeList, null, E_OUT_OF_MEMORY, "pPrivilegeList must not be null.");
        pPrivilegeList->Construct();
  
        for (int i = 0; i < __pPrivilegeList->GetCount(); i++)
        {
 -              String* pPrivilege = dynamic_cast <String*>(__pPrivilegeList->GetAt(i));
 +              String* pPrivilege = dynamic_cast < String* >(__pPrivilegeList->GetAt(i));
                if (pPrivilege)
                {
 -                      PrivilegeInfo* pPrivilegeInfo = new (std::nothrow) PrivilegeInfo;
 +                      std::unique_ptr< PrivilegeInfo > pPrivilegeInfo(new (std::nothrow) PrivilegeInfo);
                        SysTryReturn(NID_APP, pPrivilegeInfo, null, E_OUT_OF_MEMORY, "pPrivilegeInfo must not be null.");
  
 -                      pPrivilegeInfo->Construct(*pPrivilege);
 +                      r = pPrivilegeInfo->Construct(*pPrivilege);
 +                      SysTryReturn(NID_APP, !IsFailed(r), null, E_SYSTEM, "pPrivilegeInfo->Construct() failed.");
  
 -                      r = pPrivilegeList->Add(*pPrivilegeInfo);
 +                      r = pPrivilegeList->Add(*pPrivilegeInfo.release());
 +                      SysTryReturn(NID_APP, !IsFailed(r), null, E_SYSTEM, "pPrivilegeList->Add() failed.");
                }
         }
  
 -      return pPrivilegeList;
 +      if (pPrivilegeList->GetCount() <= 0)
 +      {
 +              SysLog(NID_APP, "pPrivilegeList->GetCount() is invalid.");
 +              return null;
 +      }
 +
 +      return pPrivilegeList.release();
  }
  
  result
@@@ -999,7 -991,7 +999,7 @@@ _PackageInfoImpl::Construct(const Packa
        SysTryReturnResult(NID_APP, pPackageId, E_OUT_OF_MEMORY, "pPackageId is null");
  
        result = pkgmgrinfo_pkginfo_get_pkginfo(pPackageId.get(), &__packageInfoHandle);
-       SysTryReturnResult(NID_APP, result == PMINFO_R_OK, E_PKG_NOT_INSTALLED, "pkgmgrinfo_pkginfo_get_pkginfo() is failed. result=[%d], packageId=[%s]", result, pPackageId.get());
+       SysTryReturnResult(NID_APP, result == PMINFO_R_OK, E_PKG_NOT_INSTALLED, "pkgmgrinfo_pkginfo_get_pkginfo() is failed. result=[%d], package=[%s]", result, pPackageId.get());
  
        __fromDatabase = true;
  
@@@ -1153,7 -1145,7 +1153,7 @@@
        result = pkgmgrinfo_pkginfo_get_mainappid(__packageInfoHandle, &pMainAppId);
        if (result == PMINFO_R_OK)
        {
-               SysLog(NID_APP, "pkgmgrinfo_pkginfo_get_mainappid(): mainAppId = [%s]", pMainAppId);
+               SysLog(NID_APP, "pkgmgrinfo_pkginfo_get_mainappid(): mainApp = [%s]", pMainAppId);
                AppId mainAppId(pMainAppId);
                __mainAppId = mainAppId;
        }