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

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

Merge "audio: modify some log printing" into main am: 5b0d3fff am: a98bb79a 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2969071



Change-Id: Iaacdfc65bdf8e4e0afa1019d266751693d00868b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3231743a a98bb79a

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

+4 −4
Original line number Diff line number Diff line
@@ -3713,7 +3713,7 @@ public class AudioService extends IAudioService.Stub 
                    && AudioSystem.DEVICE_OUT_ALL_A2DP_SET.contains(device)

                    && (flags & AudioManager.FLAG_BLUETOOTH_ABS_VOLUME) == 0) {

                if (DEBUG_VOL) {

                    Log.d(TAG, "adjustSreamVolume: postSetAvrcpAbsoluteVolumeIndex index="

                    Log.d(TAG, "adjustStreamVolume: postSetAvrcpAbsoluteVolumeIndex index="

                            + newIndex + "stream=" + streamType);

                }

                mDeviceBroker.postSetAvrcpAbsoluteVolumeIndex(newIndex / 10);
@@ -3727,7 +3727,7 @@ public class AudioService extends IAudioService.Stub 
                    && streamType == getBluetoothContextualVolumeStream()

                    && (flags & AudioManager.FLAG_BLUETOOTH_ABS_VOLUME) == 0) {

                if (DEBUG_VOL) {

                    Log.d(TAG, "adjustSreamVolume postSetLeAudioVolumeIndex index="

                    Log.d(TAG, "adjustStreamVolume postSetLeAudioVolumeIndex index="

                            + newIndex + " stream=" + streamType);

                }

                mDeviceBroker.postSetLeAudioVolumeIndex(newIndex,
@@ -3740,7 +3740,7 @@ public class AudioService extends IAudioService.Stub 
                // the one expected by the hearing aid

                if (streamType == getBluetoothContextualVolumeStream()) {

                    if (DEBUG_VOL) {

                        Log.d(TAG, "adjustSreamVolume postSetHearingAidVolumeIndex index="

                        Log.d(TAG, "adjustStreamVolume postSetHearingAidVolumeIndex index="

                                + newIndex + " stream=" + streamType);

                    }

                    mDeviceBroker.postSetHearingAidVolumeIndex(newIndex, streamType);
@@ -4722,7 +4722,7 @@ public class AudioService extends IAudioService.Stub 
                && streamType == getBluetoothContextualVolumeStream()

                && (flags & AudioManager.FLAG_BLUETOOTH_ABS_VOLUME) == 0) {

            if (DEBUG_VOL) {

                Log.d(TAG, "adjustSreamVolume postSetLeAudioVolumeIndex index="

                Log.d(TAG, "setStreamVolume postSetLeAudioVolumeIndex index="

                        + index + " stream=" + streamType);

            }

            mDeviceBroker.postSetLeAudioVolumeIndex(index, mStreamStates[streamType].getMaxIndex(),