From: Tomasz Iwanek Date: Thu, 16 Jun 2016 12:57:58 +0000 (+0200) Subject: Split API in pkgmgr_registration.h X-Git-Tag: accepted/tizen/common/20160624.133942^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F07%2F75107%2F5;p=platform%2Fcore%2Fappfw%2Fwgt-backend.git Split API in pkgmgr_registration.h Submit together: - https://review.tizen.org/gerrit/75107 - https://review.tizen.org/gerrit/75108 - https://review.tizen.org/gerrit/75109 Change-Id: I259d3aac621443e7985fc2d5aa87e99d5a7bd959 --- diff --git a/src/unit_tests/smoke_test.cc b/src/unit_tests/smoke_test.cc index f150590..56dfb15 100644 --- a/src/unit_tests/smoke_test.cc +++ b/src/unit_tests/smoke_test.cc @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include #include @@ -217,13 +217,13 @@ void PackageCheckCleanup(const std::string& pkgid, void ValidatePackage(const std::string& pkgid, const std::vector& appids) { - ASSERT_TRUE(ci::IsPackageInstalled(pkgid, ci::GetRequestMode())); + ASSERT_TRUE(ci::QueryIsPackageInstalled(pkgid, ci::GetRequestMode())); ValidatePackageFS(pkgid, appids); } void CheckPackageNonExistance(const std::string& pkgid, const std::vector& appids) { - ASSERT_FALSE(ci::IsPackageInstalled(pkgid, ci::GetRequestMode())); + ASSERT_FALSE(ci::QueryIsPackageInstalled(pkgid, ci::GetRequestMode())); PackageCheckCleanup(pkgid, appids); } diff --git a/src/wgt/wgt_app_query_interface.cc b/src/wgt/wgt_app_query_interface.cc index e4245cc..912c861 100644 --- a/src/wgt/wgt_app_query_interface.cc +++ b/src/wgt/wgt_app_query_interface.cc @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include #include @@ -107,21 +107,21 @@ bool WgtAppQueryInterface::IsAppInstalledByArgv(int argc, char** argv) { return false; // argument from commandline is package id - if (ci::IsPackageInstalled(arg, ci::GetRequestMode())) + if (ci::QueryIsPackageInstalled(arg, ci::GetRequestMode())) return true; // argument from commandline is path to file std::string pkg_id = GetPkgIdFromPath(arg); if (pkg_id.empty()) return false; - return ci::IsPackageInstalled(pkg_id, ci::GetRequestMode()); + return ci::QueryIsPackageInstalled(pkg_id, ci::GetRequestMode()); } bool WgtAppQueryInterface::IsHybridApplication(int argc, char** argv) { std::string arg = GetInstallationRequestInfo(argc, argv); if (arg.find("apps_rw/recovery-") != std::string::npos) arg = ReadPkgidFromRecovery(arg); - if (ci::IsPackageInstalled(arg, ci::GetRequestMode())) { + if (ci::QueryIsPackageInstalled(arg, ci::GetRequestMode())) { bf::path package_directory(ci::GetRootAppPath(false)); if (bf::exists(package_directory / arg / kTizenManifestLocation) && bf::exists(package_directory / arg / kHybridConfigLocation))