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

Commit e62aa5b9 authored by Vlad Popa's avatar Vlad Popa
Browse files

Use getDeviceAttributesForStream which returns AudioDeviceAttributes 

Instead of getDeviceForStream which returns the device type now use the
new method getDeviceAttributesForStream. This allows for more
specialized volume adjustment/setting logic based on a specific device.

Bug: 393657380
Test: atest AudioDeviceVolumeManagerTest, VolumeHelperTest, AbsoluteVolumeBehaviorTest
Flag: EXEMPT refactor
Change-Id: Ie5b83baeaf5007edb28a1a042266d8aa5b82ba2b
parent 97f07cf2

media/java/android/media/AudioSystem.java

+21 −20
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ import java.util.List; 
import java.util.Map;

import java.util.Objects;

import java.util.Set;

import java.util.TreeSet;



/* IF YOU CHANGE ANY OF THE CONSTANTS IN THIS FILE, DO NOT FORGET

 * TO UPDATE THE CORRESPONDING NATIVE GLUE AND AudioManager.java.
@@ -1909,12 +1908,13 @@ public class AudioSystem 
     * compatibility reasons.  Legacy apps will not understand these new device types

     * and it will raise false matches with old device types.

     */

    public static int getDeviceMaskFromSet(@NonNull Set<Integer> deviceSet) {

    public static int getDeviceMaskFromSet(@NonNull Set<AudioDeviceAttributes> deviceSet) {

        int deviceMask = DEVICE_NONE; // zero.

        int deviceInChecksum = DEVICE_BIT_IN;

        for (Integer device : deviceSet) {

        for (AudioDeviceAttributes deviceAttr : deviceSet) {

            final int device = deviceAttr.getInternalType();

            if ((device & (device - 1) & ~DEVICE_BIT_IN) != 0) {

                Log.v(TAG, "getDeviceMaskFromSet skipping multi-bit device value " + device);

                Log.i(TAG, "getDeviceMaskFromSet skipping multi-bit device value " + device);

                continue;

            }

            deviceMask |= device;
@@ -1930,15 +1930,15 @@ public class AudioSystem 


    /** @hide */

    @NonNull

    public static String deviceSetToString(@NonNull Set<Integer> devices) {

    public static String deviceSetToString(@NonNull Set<AudioDeviceAttributes> devices) {

        int n = 0;

        StringBuilder sb = new StringBuilder();

        for (Integer device : devices) {

        for (AudioDeviceAttributes device : devices) {

            if (n++ > 0) {

                sb.append(", ");

            }

            sb.append(AudioSystem.getDeviceName(device));

            sb.append("(" + Integer.toHexString(device) + ")");

            sb.append(AudioSystem.getDeviceName(device.getInternalType()));

            sb.append("(").append(Integer.toHexString(device.getInternalType())).append(")");

        }

        return sb.toString();

    }
@@ -2603,24 +2603,25 @@ public class AudioSystem 
     * represent multiple audio device types.

     */

    @NonNull

    public static Set<Integer> generateAudioDeviceTypesSet(

    public static Set<AudioDeviceAttributes> generateAudioDeviceTypesSet(

            @NonNull List<AudioDeviceAttributes> deviceList) {

        Set<Integer> deviceTypes = new TreeSet<>();

        for (AudioDeviceAttributes device : deviceList) {

            deviceTypes.add(device.getInternalType());

        }

        return deviceTypes;

        return Set.copyOf(deviceList);

    }



    /**

     * @hide

     * Return the intersection of two audio device types collections.

     * Return the intersection of two audio device attributes which match the device types.

     */

    public static Set<Integer> intersectionAudioDeviceTypes(

            @NonNull Set<Integer> a, @NonNull Set<Integer> b) {

        Set<Integer> intersection = new TreeSet<>(a);

        intersection.retainAll(b);

        return intersection;

    public static Set<AudioDeviceAttributes> intersectionAudioDeviceTypes(

            @NonNull Set<Integer> a, @NonNull Set<AudioDeviceAttributes> b) {

        Set<AudioDeviceAttributes> result = new HashSet<>();

        b.forEach(ada -> {

            if (a.contains(ada.getInternalType())) {

                result.add(ada);

            }

        });



        return result;

    }



    /**

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

+4 −1
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ import java.util.NoSuchElementException; 
import java.util.Objects;

import java.util.Set;

import java.util.concurrent.atomic.AtomicBoolean;

import java.util.stream.Collectors;



/**

 * @hide
@@ -2389,7 +2390,9 @@ public class AudioDeviceBroker { 
                || message == MSG_L_BLUETOOTH_DEVICE_CONFIG_CHANGE)

                && AudioSystem.isStreamActive(AudioSystem.STREAM_MUSIC, 0)

                && hasIntersection(mDeviceInventory.DEVICE_OVERRIDE_A2DP_ROUTE_ON_PLUG_SET,

                        mAudioService.getDeviceSetForStream(AudioSystem.STREAM_MUSIC))) {

                mAudioService.getDeviceSetForStream(AudioSystem.STREAM_MUSIC).stream().map(

                        AudioDeviceAttributes::getInternalType).collect(

                        Collectors.toSet()))) {

            return false;

        }

        return true;

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

+138 −97

File changed.

Preview size limit exceeded, changes collapsed.

services/tests/servicestests/src/com/android/server/audio/AbsoluteVolumeBehaviorTest.java

+5 −0
Original line number Diff line number Diff line
@@ -114,6 +114,11 @@ public class AbsoluteVolumeBehaviorTest { 
            public int getDeviceForStream(int stream) {

                return AudioSystem.DEVICE_OUT_SPEAKER;

            }



            @Override

            public AudioDeviceAttributes getDeviceAttributesForStream(int stream) {

                return DEVICE_SPEAKER_OUT;

            }

        };



        mTestLooper.dispatchAll();

services/tests/servicestests/src/com/android/server/audio/VolumeHelperTest.java

+8 −0
Original line number Diff line number Diff line
@@ -186,6 +186,14 @@ public class VolumeHelperTest { 
            return mStreamDevice.get(stream);

        }



        @Override

        public AudioDeviceAttributes getDeviceAttributesForStream(int stream) {

            if (mStreamDevice.indexOfKey(stream) < 0) {

                return new AudioDeviceAttributes(DEVICE_OUT_SPEAKER, "speaker");

            }

            return new AudioDeviceAttributes(mStreamDevice.get(stream), "custom");

        }



        public void setMuteAffectedStreams(int muteAffectedStreams) {

            mMuteAffectedStreams = muteAffectedStreams;

        }