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

Commit ff7b3ba2 authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "AudioService: remove BT device connection message" into main

parents dbec5b9f f6c5b25a

services/core/java/com/android/server/audio/AudioService.java

+2 −11
Original line number Diff line number Diff line
@@ -476,7 +476,6 @@ public class AudioService extends IAudioService.Stub 
    private static final int MSG_UPDATE_A11Y_SERVICE_UIDS = 35;

    private static final int MSG_UPDATE_AUDIO_MODE = 36;

    private static final int MSG_RECORDING_CONFIG_CHANGE = 37;

    private static final int MSG_BT_DEV_CHANGED = 38;

    private static final int MSG_UPDATE_AUDIO_MODE_SIGNAL = 39;

    private static final int MSG_DISPATCH_AUDIO_MODE = 40;

    private static final int MSG_ROUTING_UPDATED = 41;
@@ -9159,11 +9158,8 @@ public class AudioService extends IAudioService.Stub 
        sDeviceLogger.enqueue(new EventLogger.StringEvent("BluetoothActiveDeviceChanged for "

                + BluetoothProfile.getProfileName(profile) + ", device update " + previousDevice

                + " -> " + newDevice).printLog(TAG));

        AudioDeviceBroker.BtDeviceChangedData data =

                new AudioDeviceBroker.BtDeviceChangedData(newDevice, previousDevice, info,

                        "AudioService");

        sendMsg(mAudioHandler, MSG_BT_DEV_CHANGED, SENDMSG_QUEUE, 0, 0,

                /*obj*/ data, /*delay*/ 0);

        mDeviceBroker.queueOnBluetoothActiveDeviceChanged(new AudioDeviceBroker.BtDeviceChangedData(

                newDevice, previousDevice, info, "AudioService"));

    }















    /** only public for mocking/spying, do not call outside of AudioService */










@@ -11272,11 +11268,6 @@ public class AudioService extends IAudioService.Stub













                    }















                    break;



























                case MSG_BT_DEV_CHANGED:













                    mDeviceBroker.queueOnBluetoothActiveDeviceChanged(













                            (AudioDeviceBroker.BtDeviceChangedData) msg.obj);













                    break;



























                case MSG_DISPATCH_AUDIO_MODE:















                    dispatchMode(msg.arg1);















                    break;