fdo-mirrors/upower
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/upower/upower.git synced 2025-12-25 06:50:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

linux: Make unknown Bluetooth devices appear as generic

Browse source 
Make Bluetooth devices for which we can't guess the "kind" or form
factor be "generic Bluetooth" devices, rather than "unknown" devices.

That should make it clearer in UIs that the devices are Bluetooth rather
than connected to the computer somehow.

Closes: #137
This commit is contained in:
Bastien Nocera 2021-06-17 11:34:40 +02:00
parent 2bddb64f68
commit 96ea5b3521
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/linux/integration-test
View file

@ -101,7 +101,8 @@ BATTERY_IFACE = 'org.bluez.Battery1'
UP_DEVICE_KIND_SCANNER,
UP_DEVICE_KIND_CAMERA,
UP_DEVICE_KIND_WEARABLE,
UP_DEVICE_KIND_TOY) = range(28)
UP_DEVICE_KIND_TOY,
UP_DEVICE_KIND_BLUETOOTH_GENERIC) = range(29)
class Tests(dbusmock.DBusTestCase):
@classmethod
@ -1711,7 +1712,7 @@ class Tests(dbusmock.DBusTestCase):
self.assertEqual(self.get_dbus_dev_property(mouse_bat0_up, 'Model'), alias)
self.assertEqual(self.get_dbus_dev_property(mouse_bat0_up, 'Percentage'), battery_level)
self.assertEqual(self.get_dbus_dev_property(mouse_bat0_up, 'PowerSupply'), False)
self.assertEqual(self.get_dbus_dev_property(mouse_bat0_up, 'Type'), UP_DEVICE_KIND_UNKNOWN)
self.assertEqual(self.get_dbus_dev_property(mouse_bat0_up, 'Type'), UP_DEVICE_KIND_BLUETOOTH_GENERIC)
self.stop_daemon()
def test_bluetooth_headphones(self):
@ -1806,7 +1807,7 @@ class Tests(dbusmock.DBusTestCase):
self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Model'), alias)
self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Percentage'), battery_level)
self.assertEqual(self.get_dbus_dev_property(bat0_up, 'PowerSupply'), False)
self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Type'), UP_DEVICE_KIND_UNKNOWN)
self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Type'), UP_DEVICE_KIND_BLUETOOTH_GENERIC)
self.stop_daemon()
#

6
src/linux/up-device-bluez.c
View file

@ -59,7 +59,7 @@ appearance_to_kind (guint16 appearance)
break;
}
return UP_DEVICE_KIND_UNKNOWN;
return UP_DEVICE_KIND_BLUETOOTH_GENERIC;
}
/**
@ -147,7 +147,7 @@ class_to_kind (guint32 class)
return UP_DEVICE_KIND_TOY;
}
return UP_DEVICE_KIND_UNKNOWN;
return UP_DEVICE_KIND_BLUETOOTH_GENERIC;
}
/**
@ -198,7 +198,7 @@ up_device_bluez_coldplug (UpDevice *device)
kind = class_to_kind (class);
g_variant_unref (v);
} else {
kind = UP_DEVICE_KIND_UNKNOWN;
kind = UP_DEVICE_KIND_BLUETOOTH_GENERIC;
}
v = g_dbus_proxy_get_cached_property (proxy, "Address");