fdo-mirrors/power-profiles-daemon
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/upower/power-profiles-daemon.git synced 2026-05-05 00:38:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

platform-profile: Restore existing profile on start

Browse source
This commit is contained in:
Bastien Nocera 2021-03-16 17:04:59 +01:00
parent d99a0f774a
commit a12820ab4f
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ppd-driver-platform-profile.c
View file

@ -278,6 +278,8 @@ ppd_driver_platform_profile_probe (PpdDriver *driver,
return self->probe_result;
}
*prev_profile = read_platform_profile ();
/* Lenovo-specific proximity sensor */
self->device = ppd_utils_find_device ("platform",
(GCompareFunc) find_dytc,

11
tests/integration-test
View file

@ -285,8 +285,9 @@ class Tests(dbusmock.DBusTestCase):
profiles = self.get_dbus_property('Profiles')
self.assertEqual(len(profiles), 3)
self.assertEqual(self.get_dbus_property('ActiveProfile'), 'balanced')
self.assertEqual(self.get_dbus_property('ActiveProfile'), 'performance')
self.set_dbus_property('ActiveProfile', GLib.Variant.new_string('balanced'))
self.set_dbus_property('ActiveProfile', GLib.Variant.new_string('performance'))
self.assertEqual(self.get_dbus_property('ActiveProfile'), 'performance')
@ -409,10 +410,7 @@ class Tests(dbusmock.DBusTestCase):
self.assertEqual(profiles[0]['Profile'], 'power-saver')
self.assertEqual(profiles[2]['Driver'], 'platform_profile')
self.assertEqual(profiles[2]['Profile'], 'performance')
self.assertEqual(self.get_dbus_property('ActiveProfile'), 'balanced')
# Verify that platform_profile got reset
self.assertEventually(lambda: self.read_file (os.path.join(self.testbed.get_root_dir(), "sys/firmware/acpi/platform_profile")) == b'balanced')
self.assertEqual(self.get_dbus_property('ActiveProfile'), 'performance')
# lapmode detected, but performance wasn't selected anyway
self.testbed.set_attribute(self.tp_acpi, 'dytc_lapmode', '1\n')
@ -515,7 +513,8 @@ class Tests(dbusmock.DBusTestCase):
self.assertEventually(lambda: len(self.get_dbus_property('Profiles')) == 3)
profiles = self.get_dbus_property('Profiles')
self.assertEqual(len(profiles), 3)
self.assertEqual(self.get_dbus_property('ActiveProfile'), 'balanced')
# Was set in platform_profile before we loaded the drivers
self.assertEqual(self.get_dbus_property('ActiveProfile'), 'performance')
self.assertEqual(self.get_dbus_property('PerformanceInhibited'), '')
self.stop_daemon()