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

Commit db76d3b4 authored by Vlad Popa's avatar Vlad Popa Committed by Android (Google) Code Review
Browse files

Merge "Improve dumpsys for setLeAudioVolume" into main

parents c4987ec4 b3f935d5

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

+5 −1
Original line number Original line Diff line number Diff line
@@ -259,6 +259,7 @@ public class AudioServiceEvents { 
        /** used for VOL_ADJUST_VOL_UID,

        /** used for VOL_ADJUST_VOL_UID,

         *           VOL_ADJUST_SUGG_VOL,

         *           VOL_ADJUST_SUGG_VOL,

         *           VOL_ADJUST_STREAM_VOL,

         *           VOL_ADJUST_STREAM_VOL,

         *           VOL_SET_LE_AUDIO_VOL

         */

         */

        VolumeEvent(int op, int stream, int val1, int val2, String caller) {

        VolumeEvent(int op, int stream, int val1, int val2, String caller) {

            mOp = op;

            mOp = op;
@@ -434,6 +435,8 @@ public class AudioServiceEvents { 
                            .set(MediaMetrics.Property.EVENT, "setLeAudioVolume")

                            .set(MediaMetrics.Property.EVENT, "setLeAudioVolume")

                            .set(MediaMetrics.Property.INDEX, mVal1)

                            .set(MediaMetrics.Property.INDEX, mVal1)

                            .set(MediaMetrics.Property.MAX_INDEX, mVal2)

                            .set(MediaMetrics.Property.MAX_INDEX, mVal2)

                            .set(MediaMetrics.Property.STREAM_TYPE,

                                    AudioSystem.streamToString(mStream))

                            .record();

                            .record();

                    return;

                    return;

                case VOL_SET_AVRCP_VOL:

                case VOL_SET_AVRCP_VOL:
@@ -519,7 +522,8 @@ public class AudioServiceEvents { 
                            .append(" gain dB:").append(mVal2)

                            .append(" gain dB:").append(mVal2)

                            .toString();

                            .toString();

                case VOL_SET_LE_AUDIO_VOL:

                case VOL_SET_LE_AUDIO_VOL:

                    return new StringBuilder("setLeAudioVolume:")

                    return new StringBuilder("setLeAudioVolume(stream:")

                            .append(AudioSystem.streamToString(mStream))

                            .append(" index:").append(mVal1)

                            .append(" index:").append(mVal1)

                            .append(" maxIndex:").append(mVal2)

                            .append(" maxIndex:").append(mVal2)

                            .toString();

                            .toString();

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -470,7 +470,8 @@ public class BtHelper { 
                    + index + " volume=" + volume);

                    + index + " volume=" + volume);

        }

        }

        AudioService.sVolumeLogger.enqueue(new AudioServiceEvents.VolumeEvent(

        AudioService.sVolumeLogger.enqueue(new AudioServiceEvents.VolumeEvent(

                AudioServiceEvents.VolumeEvent.VOL_SET_LE_AUDIO_VOL, index, maxIndex));

                AudioServiceEvents.VolumeEvent.VOL_SET_LE_AUDIO_VOL, streamType, index,

                maxIndex, /*caller=*/null));

        try {

        try {

            mLeAudio.setVolume(volume);

            mLeAudio.setVolume(volume);

        } catch (Exception e) {

        } catch (Exception e) {