Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71e9344d authored by Ron Shaffer's avatar Ron Shaffer Committed by Steve Kondik
Browse files

Bluetooth: Change typos in calls to remove D-Bus filter rules 

During Bluetooth eventloop teardown, the strings used in calls to remove the
D-Bus filter rules were incorrect. This leaves rules assigned to the connection,
and eventually the maximum number of rules are exceeded preventing Bluetooth
from being enabled.

Change-Id: I3228a63f5164e29873e245efff4986e602c043ba
CRs-fixed: 235360
parent ddd35031

core/jni/android_server_BluetoothEventLoop.cpp

100755 → 100644
+3 −9
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ static jboolean setUpEventLoop(native_data_t *nat) { 
        }



        dbus_bus_add_match(nat->conn,

                "type='signal',interface='org.bluez.AudioSink'",

                "type='signal',interface='"BLUEZ_DBUS_BASE_IFC".AudioSink'",

                &err);

        if (dbus_error_is_set(&err)) {

            LOG_AND_FREE_DBUS_ERROR(&err);
@@ -389,19 +389,13 @@ static void tearDownEventLoop(native_data_t *nat) { 
        dbus_connection_unregister_object_path(nat->conn, agent_path);



        dbus_bus_remove_match(nat->conn,

                "type='signal',interface='org.bluez.audio.Sink'",

                "type='signal',interface='"BLUEZ_DBUS_BASE_IFC".AudioSink'",

                &err);

        if (dbus_error_is_set(&err)) {

            LOG_AND_FREE_DBUS_ERROR(&err);

        }

        dbus_bus_remove_match(nat->conn,

                "type='signal',interface='org.bluez.audio.Device'",

                &err);

        if (dbus_error_is_set(&err)) {

            LOG_AND_FREE_DBUS_ERROR(&err);

        }

        dbus_bus_remove_match(nat->conn,

                "type='signal',interface='org.bluez.audio.Manager'",

                "type='signal',interface='"BLUEZ_DBUS_BASE_IFC".Device'",

                &err);

        if (dbus_error_is_set(&err)) {

            LOG_AND_FREE_DBUS_ERROR(&err);