Commit b9c2b859 authored by Jeevan Shikaram's avatar Jeevan Shikaram Committed by Commit Bot

[App Management] Generically check if an ARC app is a system app.

This CL checks if an ARC app is "sticky" and classifies it as a system
installed app if it is.

Fixed: 1010821, 1048874
Change-Id: I1c6fdf752a0437cf012a0051c01c4e1600f0353e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2038191
Commit-Queue: Jeevan Shikaram <jshikaram@chromium.org>
Reviewed-by: default avatarNancy Wang <nancylingwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#738466}
parent ece5bb95
...@@ -858,22 +858,24 @@ void ArcApps::LoadPlayStoreIcon(apps::mojom::IconCompression icon_compression, ...@@ -858,22 +858,24 @@ void ArcApps::LoadPlayStoreIcon(apps::mojom::IconCompression icon_compression,
is_placeholder_icon, icon_effects, std::move(callback)); is_placeholder_icon, icon_effects, std::move(callback));
} }
apps::mojom::InstallSource GetInstallSource(const ArcAppListPrefs* prefs, apps::mojom::InstallSource GetInstallSource(
const std::string& package_name) { const ArcAppListPrefs* prefs,
// TODO(crbug.com/1010821): Create a generic check for kSystem apps. const ArcAppListPrefs::AppInfo* app_info) {
if (prefs->GetAppIdByPackageName(package_name) == arc::kPlayStoreAppId) { // Sticky represents apps that cannot be uninstalled and are installed by the
// system.
if (app_info->sticky) {
return apps::mojom::InstallSource::kSystem; return apps::mojom::InstallSource::kSystem;
} }
if (prefs->IsDefault(package_name)) { if (prefs->IsDefault(app_info->package_name)) {
return apps::mojom::InstallSource::kDefault; return apps::mojom::InstallSource::kDefault;
} }
if (prefs->IsOem(package_name)) { if (prefs->IsOem(app_info->package_name)) {
return apps::mojom::InstallSource::kOem; return apps::mojom::InstallSource::kOem;
} }
if (prefs->IsControlledByPolicy(package_name)) { if (prefs->IsControlledByPolicy(app_info->package_name)) {
return apps::mojom::InstallSource::kPolicy; return apps::mojom::InstallSource::kPolicy;
} }
...@@ -907,7 +909,7 @@ apps::mojom::AppPtr ArcApps::Convert(ArcAppListPrefs* prefs, ...@@ -907,7 +909,7 @@ apps::mojom::AppPtr ArcApps::Convert(ArcAppListPrefs* prefs,
app->last_launch_time = app_info.last_launch_time; app->last_launch_time = app_info.last_launch_time;
app->install_time = app_info.install_time; app->install_time = app_info.install_time;
app->install_source = GetInstallSource(prefs, app_info.package_name); app->install_source = GetInstallSource(prefs, &app_info);
app->is_platform_app = apps::mojom::OptionalBool::kFalse; app->is_platform_app = apps::mojom::OptionalBool::kFalse;
app->recommendable = apps::mojom::OptionalBool::kTrue; app->recommendable = apps::mojom::OptionalBool::kTrue;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment