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

Commit ca4d4de8 authored by Jaikumar Ganesh's avatar Jaikumar Ganesh Committed by Android (Google) Code Review
Browse files

Merge "Revert "Fix runtime reboot when connecting to a A2DP headset and"" into kraken

parents 37f4f5b1 9997f66f

core/java/android/server/BluetoothA2dpService.java

+0 −1
Original line number Diff line number Diff line
@@ -554,7 +554,6 @@ public class BluetoothA2dpService extends IBluetoothA2dp.Stub { 
        if (!result) {

            if (deviceObjectPath != null) {

                String address = mBluetoothService.getAddressFromObjectPath(deviceObjectPath);

                if (address == null) return;

                BluetoothDevice device = mAdapter.getRemoteDevice(address);

                int state = getSinkState(device);

                handleSinkStateChange(device, state, BluetoothA2dp.STATE_DISCONNECTED);

core/jni/android_bluetooth_common.cpp

+0 −1
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ static Properties adapter_properties[] = { 
    {"PairableTimeout", DBUS_TYPE_UINT32},

    {"Discovering", DBUS_TYPE_BOOLEAN},

    {"Devices", DBUS_TYPE_ARRAY},

    {"UUIDs", DBUS_TYPE_ARRAY},

};



typedef union {