Revert "[Package][Application] return "(Null)" string for optional pkg and app info"

This reverts commit 5afd191c40f0ab96f00be1615973469f66b78cc5.

Change-Id: If238c58ba8b821a8ec4abc572f612d0f93fcadcc
Signed-off-by: taekeun.kang <taekeun.kang@samsung.com>

diff --git a/src/application/application_utils.cc b/src/application/application_utils.cc
index 2d005621b5dc9d2afc597c4092e32e43d633fa77..b47f203e13ec1eb6469c108ff80446f0d684f200 100755 (executable)
--- a/src/application/application_utils.cc
+++ b/src/application/application_utils.cc
@@ -48,10 +48,6 @@ void ApplicationUtils::CreateApplicationInformation(const pkgmgrinfo_appinfo_h h
   ret = pkgmgrinfo_appinfo_get_label(handle, &tmp_str);
   if ((PMINFO_R_OK != ret) || (nullptr == tmp_str)) {
     LoggerE("Failed to get label");
-    if (PMINFO_R_ERROR == ret) {
-      tmp_str = "(NULL)";
-      app_info->insert(std::make_pair("name", picojson::value(tmp_str)));
-    }
   } else {
     app_info->insert(std::make_pair("name", picojson::value(tmp_str)));
   }
@@ -115,10 +111,6 @@ void ApplicationUtils::CreateApplicationInformation(const pkgmgrinfo_appinfo_h h
     ret = pkgmgrinfo_pkginfo_get_version(pkginfo, &tmp_str);
     if ((PMINFO_R_OK != ret) || (nullptr == tmp_str)) {
       LoggerE("Failed to get version");
-      if (PMINFO_R_ERROR == ret) {
-        tmp_str = "(NULL)";
-        app_info->insert(std::make_pair("version", picojson::value(tmp_str)));
-      }
     } else {
       app_info->insert(std::make_pair("version", picojson::value(tmp_str)));
     }

diff --git a/src/package/package_info_provider.cc b/src/package/package_info_provider.cc
index bfc65d7973ab8be6e5165699239a13d32213584f..78d3b720b42cf88c4a9cff245a0ac49454de2de5 100755 (executable)
--- a/src/package/package_info_provider.cc
+++ b/src/package/package_info_provider.cc
@@ -165,10 +165,7 @@ bool PackageInfoProvider:: ConvertToPackageToObject(
   ret = pkgmgrinfo_pkginfo_get_label(info, &name);
   if ( (ret != PMINFO_R_OK) || (name == NULL) ) {
     LoggerE("[%s] Failed to get package name", id);
-    if (PMINFO_R_ERROR != ret) {
-      return false;
-    }
-    name = "(NULL)";
+    return false;
   }
   out["name"] = picojson::value(name);
 
@@ -176,10 +173,7 @@ bool PackageInfoProvider:: ConvertToPackageToObject(
   ret = pkgmgrinfo_pkginfo_get_icon(info, &iconPath);
   if ( (ret != PMINFO_R_OK) || (iconPath == NULL) ) {
     LoggerE("[%s] Failed to get package iconPath", id);
-    if (PMINFO_R_ERROR != ret) {
-      return false;
-    }
-    iconPath = "(NULL)";
+    return false;
   }
   out["iconPath"] = picojson::value(iconPath);
 
@@ -187,10 +181,7 @@ bool PackageInfoProvider:: ConvertToPackageToObject(
   ret = pkgmgrinfo_pkginfo_get_version(info, &version);
   if ( (ret != PMINFO_R_OK) || (version == NULL) ) {
     LoggerE("[%s] Failed to get package version", id);
-    if (PMINFO_R_ERROR != ret) {
-      return false;
-    }
-    version = "(NULL)";
+    return false;
   }
   out["version"] = picojson::value(version);
 
@@ -208,10 +199,7 @@ bool PackageInfoProvider:: ConvertToPackageToObject(
   ret = pkgmgrinfo_pkginfo_get_author_name(info, &author);
   if ( (ret != PMINFO_R_OK) || (author == NULL) ) {
     LoggerE("[%s] Failed to get package author", id);
-    if (PMINFO_R_ERROR != ret) {
-      return false;
-    }
-    author = "(NULL)";
+    return false;
   }
   out["author"] = picojson::value(author);
 
@@ -219,10 +207,7 @@ bool PackageInfoProvider:: ConvertToPackageToObject(
   ret = pkgmgrinfo_pkginfo_get_description(info, &description);
   if ( (ret != PMINFO_R_OK) || (description == NULL) ) {
     LoggerE("[%s] Failed to get package description", id);
-    if (PMINFO_R_ERROR != ret) {
-      return false;
-    }
-    description = "(NULL)";
+    return false;
   }
   out["description"] = picojson::value(description);