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

Commit 8d2b29b9 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Automerger Merge Worker
Browse files

Merge "AudioService: logs for volume behavior and absolute volume on A2DP"... 

Merge "AudioService: logs for volume behavior and absolute volume on A2DP" into tm-dev am: 189ce289 am: 05336a27

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



Change-Id: Id070add32c813459d8b044fc13ca56f1c48b3fbe
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5240768d 05336a27

media/java/android/media/AudioDeviceVolumeManager.java

+22 −0
Original line number Diff line number Diff line
@@ -298,6 +298,28 @@ public class AudioDeviceVolumeManager { 
                "removeOnDeviceVolumeBehaviorChangedListener");

    }



    /**

     * Return human-readable name for volume behavior

     * @param behavior one of the volume behaviors defined in AudioManager

     * @return a string for the given behavior

     */

    public static String volumeBehaviorName(@AudioManager.DeviceVolumeBehavior int behavior) {

        switch (behavior) {

            case AudioManager.DEVICE_VOLUME_BEHAVIOR_VARIABLE:

                return "DEVICE_VOLUME_BEHAVIOR_VARIABLE";

            case AudioManager.DEVICE_VOLUME_BEHAVIOR_FULL:

                return "DEVICE_VOLUME_BEHAVIOR_FULL";

            case AudioManager.DEVICE_VOLUME_BEHAVIOR_FIXED:

                return "DEVICE_VOLUME_BEHAVIOR_FIXED";

            case AudioManager.DEVICE_VOLUME_BEHAVIOR_ABSOLUTE:

                return "DEVICE_VOLUME_BEHAVIOR_ABSOLUTE";

            case AudioManager.DEVICE_VOLUME_BEHAVIOR_ABSOLUTE_MULTI_MODE:

                return "DEVICE_VOLUME_BEHAVIOR_ABSOLUTE_MULTI_MODE";

            default:

                return "invalid volume behavior " + behavior;

        }

    }



    private final class DeviceVolumeBehaviorDispatcherStub

            extends IDeviceVolumeBehaviorDispatcher.Stub implements CallbackUtil.DispatcherStub {

        public void register(boolean register) {

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

+6 −1
Original line number Diff line number Diff line
@@ -6637,6 +6637,11 @@ public class AudioService extends IAudioService.Stub 
        // verify arguments

        Objects.requireNonNull(device);

        AudioManager.enforceValidVolumeBehavior(deviceVolumeBehavior);

        sVolumeLogger.log(new AudioEventLogger.StringEvent("setDeviceVolumeBehavior: dev:"

                + AudioSystem.getOutputDeviceName(device.getInternalType()) + " addr:"

                + device.getAddress() + " behavior:"

                + AudioDeviceVolumeManager.volumeBehaviorName(deviceVolumeBehavior)

                + " pack:" + pkgName).printLog(TAG));

        if (pkgName == null) {

            pkgName = "";

        }
@@ -8352,7 +8357,7 @@ public class AudioService extends IAudioService.Stub 
    private void avrcpSupportsAbsoluteVolume(String address, boolean support) {

        // address is not used for now, but may be used when multiple a2dp devices are supported

        sVolumeLogger.log(new AudioEventLogger.StringEvent("avrcpSupportsAbsoluteVolume addr="

                + address + " support=" + support));

                + address + " support=" + support).printLog(TAG));

        mDeviceBroker.setAvrcpAbsoluteVolumeSupported(support);

        setAvrcpAbsoluteVolumeSupported(support);

    }