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

Commit f0121989 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "AudioDeviceBroker: remove unused messages" into main

parents 40ffdccd 90f8a313

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

+0 −10
Original line number Diff line number Diff line
@@ -2205,12 +2205,6 @@ public class AudioDeviceBroker { 
    private static final int MSG_I_BT_SERVICE_DISCONNECTED_PROFILE = 22;

    private static final int MSG_IL_BT_SERVICE_CONNECTED_PROFILE = 23;



    // process external command to (dis)connect an A2DP device, obj is BtDeviceConnectionInfo

    private static final int MSG_L_A2DP_DEVICE_CONNECTION_CHANGE_EXT = 29;



    // process external command to (dis)connect a hearing aid device

    private static final int MSG_L_HEARING_AID_DEVICE_CONNECTION_CHANGE_EXT = 31;



    private static final int MSG_L_COMMUNICATION_ROUTE_CLIENT_DIED = 34;

    private static final int MSG_CHECK_MUTE_MUSIC = 35;

    private static final int MSG_REPORT_NEW_ROUTES_A2DP = 36;
@@ -2246,8 +2240,6 @@ public class AudioDeviceBroker { 
            case MSG_IIL_BTLEAUDIO_TIMEOUT:

            case MSG_L_BLUETOOTH_DEVICE_CONFIG_CHANGE:

            case MSG_TOGGLE_HDMI:

            case MSG_L_A2DP_DEVICE_CONNECTION_CHANGE_EXT:

            case MSG_L_HEARING_AID_DEVICE_CONNECTION_CHANGE_EXT:

            case MSG_CHECK_MUTE_MUSIC:

            case MSG_IL_BT_HEARING_AID_TIMEOUT:

                return true;
@@ -2373,7 +2365,6 @@ public class AudioDeviceBroker { 
        MESSAGES_MUTE_MUSIC.add(MSG_L_BT_ACTIVE_DEVICE_CHANGE_EXT);

        MESSAGES_MUTE_MUSIC.add(MSG_L_SET_BT_ACTIVE_DEVICE);

        MESSAGES_MUTE_MUSIC.add(MSG_L_BLUETOOTH_DEVICE_CONFIG_CHANGE);

        MESSAGES_MUTE_MUSIC.add(MSG_L_A2DP_DEVICE_CONNECTION_CHANGE_EXT);

        MESSAGES_MUTE_MUSIC.add(MSG_L_SET_FORCE_BT_A2DP_USE);

    }
@@ -2392,7 +2383,6 @@ public class AudioDeviceBroker { 
        }

        // Do not mute on bluetooth event if music is playing on a wired headset.

        if ((message == MSG_L_SET_BT_ACTIVE_DEVICE

                || message == MSG_L_A2DP_DEVICE_CONNECTION_CHANGE_EXT

                || message == MSG_L_BLUETOOTH_DEVICE_CONFIG_CHANGE)

                && AudioSystem.isStreamActive(AudioSystem.STREAM_MUSIC, 0)

                && hasIntersection(mDeviceInventory.DEVICE_OVERRIDE_A2DP_ROUTE_ON_PLUG_SET,