From 0d073699d218e987b4f34940a231786465d582b8 Mon Sep 17 00:00:00 2001 From: hanyuhang Date: Thu, 6 Aug 2020 10:49:58 +0800 Subject: [PATCH] Anbox:add_or_update:Skip 5 apk's desktop com-android-calendar com-android-deskclock com-android-contacts com-android-email com-android-music --- src/anbox/application/launcher_storage.cpp | 17 +++++++++++++++-- src/anbox/application/launcher_storage.h | 2 ++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/anbox/application/launcher_storage.cpp b/src/anbox/application/launcher_storage.cpp index bdbcf37f..da7e26ff 100644 --- a/src/anbox/application/launcher_storage.cpp +++ b/src/anbox/application/launcher_storage.cpp @@ -34,9 +34,17 @@ constexpr const char *snap_exe_path{"/snap/bin/anbox"}; namespace anbox { namespace application { LauncherStorage::LauncherStorage(const fs::path &path) : - path_(path) {} + path_(path) { + set_.insert("com-android-contacts"); + set_.insert("com-android-calendar"); + set_.insert("com-android-deskclock"); + set_.insert("com-android-email"); + set_.insert("com-android-music"); +} -LauncherStorage::~LauncherStorage() {} +LauncherStorage::~LauncherStorage() { + set_.clear(); +} void LauncherStorage::reset() { if (fs::exists(path_)) { @@ -69,6 +77,11 @@ void LauncherStorage::add_or_update(const Database::Item &item) { auto package_name = item.package; std::replace(package_name.begin(), package_name.end(), '.', '-'); + + if(set_.count(package_name)) { + DEBUG("package_name:%s skip!!!\n", package_name); + return ; + } auto exe_path = utils::process_get_exe_path(getpid()); if (utils::get_env_value("SNAP").length() > 0) diff --git a/src/anbox/application/launcher_storage.h b/src/anbox/application/launcher_storage.h index 55cfd8a9..5eb5f4cf 100644 --- a/src/anbox/application/launcher_storage.h +++ b/src/anbox/application/launcher_storage.h @@ -23,6 +23,7 @@ #include #include +#include #include #include @@ -44,6 +45,7 @@ class LauncherStorage { boost::filesystem::path path_for_item_icon(const std::string &package_name); boost::filesystem::path path_; + std::set set_; }; } // namespace application } // namespace anbox -- GitLab