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

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

Merge "AbsoluteVolume change custom call to official API" am: d51c3f3a am:... 

Merge "AbsoluteVolume change custom call to official API" am: d51c3f3a am: 29da6bb3 am: 548b9eaf

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

Change-Id: I771df5bb2b63ec924d964ad5ee723bd74c0e45f3
parents 29958c66 548b9eaf

media/java/android/media/AudioManager.java

+0 −15
Original line number Diff line number Diff line
@@ -5203,21 +5203,6 @@ public class AudioManager { 
        }

    }



    /**

     * @hide

     * Notifies AudioService that it is connected to an A2DP device that supports absolute volume,

     * so that AudioService can send volume change events to the A2DP device, rather than handling

     * them.

     */

    public void avrcpSupportsAbsoluteVolume(String address, boolean support) {

        final IAudioService service = getService();

        try {

            service.avrcpSupportsAbsoluteVolume(address, support);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



     /**

      * {@hide}

      */

media/java/android/media/IAudioService.aidl

+0 −2
Original line number Diff line number Diff line
@@ -171,8 +171,6 @@ interface IAudioService { 


    int getEncodedSurroundMode(int targetSdkVersion);



    oneway void avrcpSupportsAbsoluteVolume(String address, boolean support);



    void setSpeakerphoneOn(IBinder cb, boolean on);



    boolean isSpeakerphoneOn();

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

+6 −1
Original line number Diff line number Diff line
@@ -6145,6 +6145,11 @@ public class AudioService extends IAudioService.Stub 
        if (pkgName == null) {

            pkgName = "";

        }

        if (device.getType() == AudioDeviceInfo.TYPE_BLUETOOTH_A2DP) {

            avrcpSupportsAbsoluteVolume(device.getAddress(),

                    deviceVolumeBehavior == AudioManager.DEVICE_VOLUME_BEHAVIOR_ABSOLUTE);

            return;

        }



        int audioSystemDeviceOut = AudioDeviceInfo.convertDeviceTypeToInternalDevice(

                device.getType());
@@ -7801,7 +7806,7 @@ public class AudioService extends IAudioService.Stub 
        }

    }



    public void avrcpSupportsAbsoluteVolume(String address, boolean support) {

    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));