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

Commit e15fc393 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Inclusive Language Updates" am: f90278eb am: e6b3813b am: 64e0fc95 am: f12b5354 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/1463106

Change-Id: Id555137db676c444d471e8d6e2d39c6895d39af3
parents f3e2bca1 f12b5354

android/app/src/com/android/bluetooth/avrcp/AvrcpTargetService.java

+2 −2
Original line number Diff line number Diff line
@@ -35,9 +35,9 @@ import com.android.bluetooth.Utils; 
import com.android.bluetooth.a2dp.A2dpService;

import com.android.bluetooth.audio_util.BTAudioEventLogger;

import com.android.bluetooth.audio_util.MediaData;

import com.android.bluetooth.audio_util.Metadata;

import com.android.bluetooth.audio_util.MediaPlayerList;

import com.android.bluetooth.audio_util.MediaPlayerWrapper;

import com.android.bluetooth.audio_util.Metadata;

import com.android.bluetooth.audio_util.PlayStatus;

import com.android.bluetooth.audio_util.PlayerInfo;

import com.android.bluetooth.btservice.MetricsLogger;
@@ -300,7 +300,7 @@ public class AvrcpTargetService extends ProfileService { 
        return mVolumeManager.getVolume(device, mVolumeManager.getNewDeviceVolume());

    }



    // TODO (apanicke): Add checks to blacklist Absolute Volume devices if they behave poorly.

    // TODO (apanicke): Add checks to rejectlist Absolute Volume devices if they behave poorly.

    void setVolume(int avrcpVolume) {

        BluetoothDevice activeDevice = getA2dpActiveDevice();

        if (activeDevice == null) {

android/app/src/com/android/bluetooth/avrcp/AvrcpVolumeManager.java

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ class AvrcpVolumeManager extends AudioDeviceCallback { 


    // All volumes are stored at system volume values, not AVRCP values

    private static final String VOLUME_MAP = "bluetooth_volume_map";

    private static final String VOLUME_BLACKLIST = "absolute_volume_blacklist";

    private static final String VOLUME_REJECTLIST = "absolute_volume_rejectlist";

    private static final String VOLUME_CHANGE_LOG_TITLE = "Volume Events";

    private static final int AVRCP_MAX_VOL = 127;

    private static final int STREAM_MUSIC = AudioManager.STREAM_MUSIC;

android/app/src/com/android/bluetooth/hfpclient/HeadsetClientHalConstants.java

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ public final class HeadsetClientHalConstants { 
    static final int CMD_COMPLETE_ERROR_BUSY = 3;

    static final int CMD_COMPLETE_ERROR_NO_ANSWER = 4;

    static final int CMD_COMPLETE_ERROR_DELAYED = 5;

    static final int CMD_COMPLETE_ERROR_BLACKLISTED = 6;

    static final int CMD_COMPLETE_ERROR_REJECTLISTED = 6;

    static final int CMD_COMPLETE_ERROR_CME = 7;



    // match up with bthf_client_call_action_t enum of bt_hf_client.h