Attachment 139393 Details for Bug 105482 – v2-0001-displaydevice-support-Not-Charging-as-a-state.patch

[patch] v2-0001-displaydevice-support-Not-Charging-as-a-state.patch

v2-0001-displaydevice-support-Not-Charging-as-a-state.patch (text/plain), 2.28 KB, created by Ognjen Galic on 2018-05-06 14:10:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ognjen Galic

Created: 2018-05-06 14:10:18 UTC

Size: 2.28 KB

patch

obsolete

>From 4abf0643bb44ea2e38ce62655476259bfd760cf2 Mon Sep 17 00:00:00 2001
>From: Ognjen Galic <smclt30p@gmail.com>
>Date: Sun, 6 May 2018 16:07:12 +0200
>Subject: [PATCH v2] displaydevice: support "Not Charging" as a state
>
>On Lenovo ThinkPads with the linux-next kernel, due to the
>new kernel interface for the charging thresholds one battery could
>appear as "pending-charge" in UPower thus breaking the DisplayDevice
>that GNOME/MATE uses in the tray icon, displaying an unknown battery.
>
>This patch adds a set of rules that the display device will follow:
>
>1) If there is a SINGLE battery that is pending a charge, we will display
>it as if the battery is full. That is because the state of
>"pending-charge" is too complicated for the UI and could break it on
>other desktops (such as Xfce).
>
>2) If there is more than one battery but one is pending a charge, we
>will return "Charging" because the other battery is charging.
>
>None of the above will occur if there is no batteries or the state is
>not unknown.
>
>Signed-off-by: Ognjen Galic <smclt30p@gmail.com>
>---
> src/up-daemon.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
>diff --git a/src/up-daemon.c b/src/up-daemon.c
>index 1a5dddc..43d39fb 100644
>--- a/src/up-daemon.c
>+++ b/src/up-daemon.c
>@@ -160,6 +160,7 @@ up_daemon_update_display_battery (UpDaemon *daemon)
> 	gint64 time_to_empty_total = 0;
> 	gint64 time_to_full_total = 0;
> 	gboolean is_present_total = FALSE;
>+	guint num_pending = 0;
> 	guint num_batteries = 0;
> 
> 	/* Gather state from each device */
>@@ -221,6 +222,8 @@ up_daemon_update_display_battery (UpDaemon *daemon)
> 		else if (state == UP_DEVICE_STATE_FULLY_CHARGED &&
> 			 state_total == UP_DEVICE_STATE_UNKNOWN)
> 			state_total = UP_DEVICE_STATE_FULLY_CHARGED;
>+		else if (state == UP_DEVICE_STATE_PENDING_CHARGE)
>+			num_pending++;
> 
> 		/* sum up composite */
> 		kind_total = UP_DEVICE_KIND_BATTERY;
>@@ -235,6 +238,11 @@ up_daemon_update_display_battery (UpDaemon *daemon)
> 		num_batteries++;
> 	}
> 
>+	/* The display battery has an unknown state (Usually ThinkPads on Linux 4.17 with
>+	 * the battery charge threshold states set). */
>+	if (num_batteries && num_pending == num_batteries && state_total == UP_DEVICE_STATE_UNKNOWN)
>+		state_total = UP_DEVICE_STATE_FULLY_CHARGED;
>+
> 	/* Handle multiple batteries */
> 	if (num_batteries <= 1)
> 		goto out;
>-- 
>2.17.0
>

Actions: View | Splinter Review

Attachments on bug 105482: 138070 | 138336 | 139393

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.