proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-03 00:02:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix battery threshold handling when AC is *not* required

Browse Source
This commit is contained in:
Daniel Campello 2021-07-22 15:18:01 -06:00 committed by Daniel Campello
parent 8e4624809c
commit 2ece14d9e3
2 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
plugins/upower/fu-plugin-upower.c
View File

@ -108,43 +108,3 @@ fu_plugin_startup (FuPlugin *plugin, GError **error)
/* success */
return TRUE;
}
gboolean
fu_plugin_update_prepare (FuPlugin *plugin,
FwupdInstallFlags flags,
FuDevice *device,
GError **error)
{
FuContext *ctx = fu_plugin_get_context (plugin);
/* not all devices need this */
if (!fu_device_has_flag (device, FWUPD_DEVICE_FLAG_REQUIRE_AC))
return TRUE;
if (flags & FWUPD_INSTALL_FLAG_IGNORE_POWER)
return TRUE;
/* not charging */
if (fu_context_get_battery_state (ctx) == FU_BATTERY_STATE_DISCHARGING ||
fu_context_get_battery_state (ctx) == FU_BATTERY_STATE_EMPTY) {
g_set_error_literal (error,
FWUPD_ERROR,
FWUPD_ERROR_AC_POWER_REQUIRED,
"Cannot install update "
"when not on AC power unless forced");
return FALSE;
}
/* not enough just in case */
if (fu_context_get_battery_level (ctx) < fu_context_get_battery_threshold (ctx)) {
g_set_error (error,
FWUPD_ERROR,
FWUPD_ERROR_BATTERY_LEVEL_TOO_LOW,
"Cannot install update when system battery "
"is not at least %u%% unless forced",
fu_context_get_battery_threshold (ctx));
return FALSE;
}
/* success */
return TRUE;
}

48
src/fu-engine.c
View File

@ -293,10 +293,9 @@ fu_engine_ensure_device_battery_inhibit (FuEngine *self, FuDevice *device)
"Cannot install update when not on AC power");
return;
}
if (fu_device_has_flag (device, FWUPD_DEVICE_FLAG_REQUIRE_AC) &&
fu_context_get_battery_level (self->ctx) != FU_BATTERY_VALUE_INVALID &&
fu_context_get_battery_threshold (self->ctx) != FU_BATTERY_VALUE_INVALID &&
fu_context_get_battery_level (self->ctx) < fu_context_get_battery_threshold (self->ctx)) {
if (fu_context_get_battery_level(self->ctx) != FU_BATTERY_VALUE_INVALID &&
fu_context_get_battery_threshold(self->ctx) != FU_BATTERY_VALUE_INVALID &&
fu_context_get_battery_level(self->ctx) < fu_context_get_battery_threshold(self->ctx)) {
g_autofree gchar *reason = NULL;
reason = g_strdup_printf ("Cannot install update when system battery is not at least %u%%",
fu_context_get_battery_threshold (self->ctx));
@ -2798,6 +2797,44 @@ fu_engine_device_cleanup (FuEngine *self,
return fu_device_cleanup (device, flags, error);
}
static gboolean
fu_engine_device_check_power(FuEngine *self,
FuDevice *device,
FwupdInstallFlags flags,
GError **error)
{
if (flags & FWUPD_INSTALL_FLAG_IGNORE_POWER)
return TRUE;
/* not charging */
if (fu_device_has_flag(device, FWUPD_DEVICE_FLAG_REQUIRE_AC) &&
(fu_context_get_battery_state(self->ctx) == FU_BATTERY_STATE_DISCHARGING ||
fu_context_get_battery_state(self->ctx) == FU_BATTERY_STATE_EMPTY)) {
g_set_error_literal(error,
FWUPD_ERROR,
FWUPD_ERROR_AC_POWER_REQUIRED,
"Cannot install update "
"when not on AC power unless forced");
return FALSE;
}
/* not enough just in case */
if (fu_context_get_battery_level(self->ctx) != FU_BATTERY_VALUE_INVALID &&
fu_context_get_battery_threshold(self->ctx) != FU_BATTERY_VALUE_INVALID &&
fu_context_get_battery_level(self->ctx) < fu_context_get_battery_threshold(self->ctx)) {
g_set_error(error,
FWUPD_ERROR,
FWUPD_ERROR_BATTERY_LEVEL_TOO_LOW,
"Cannot install update when system battery "
"is not at least %u%% unless forced",
fu_context_get_battery_threshold(self->ctx));
return FALSE;
}
/* success */
return TRUE;
}
static gboolean
fu_engine_update_prepare (FuEngine *self,
FwupdInstallFlags flags,
@ -2816,6 +2853,9 @@ fu_engine_update_prepare (FuEngine *self,
/* don't rely on a plugin clearing this */
fu_device_remove_flag (device, FWUPD_DEVICE_FLAG_ANOTHER_WRITE_REQUIRED);
if (!fu_engine_device_check_power(self, device, flags, error))
return FALSE;
str = fu_device_to_string (device);
g_debug ("prepare -> %s", str);
if (!fu_engine_device_prepare (self, device, flags, error))