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

Commit 166bb0dc authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "No mute state in volume context changes on abs devices" into main

parents ff889786 680eba68

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -1472,8 +1472,8 @@ public class AudioDeviceBroker { 
        mAudioService.postAccessoryPlugMediaUnmute(device);

        mAudioService.postAccessoryPlugMediaUnmute(device);

    }

    }





    /*package*/ int getVssVolumeForDevice(int streamType, int device) {

    /*package*/ int getVolumeForDeviceIgnoreMute(int streamType, int device) {

        return mAudioService.getVssVolumeForDevice(streamType, device);

        return mAudioService.getVolumeForDeviceIgnoreMute(streamType, device);

    }

    }





    /*package*/ int getMaxVssVolumeForStream(int streamType) {

    /*package*/ int getMaxVssVolumeForStream(int streamType) {

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -2482,7 +2482,7 @@ public class AudioDeviceInventory { 
    @GuardedBy("mDevicesLock")

    @GuardedBy("mDevicesLock")

    private void makeHearingAidDeviceAvailable(

    private void makeHearingAidDeviceAvailable(

            String address, String name, int streamType, String eventSource) {

            String address, String name, int streamType, String eventSource) {

        final int hearingAidVolIndex = mDeviceBroker.getVssVolumeForDevice(streamType,

        final int hearingAidVolIndex = mDeviceBroker.getVolumeForDeviceIgnoreMute(streamType,

                DEVICE_OUT_HEARING_AID);

                DEVICE_OUT_HEARING_AID);

        mDeviceBroker.postSetHearingAidVolumeIndex(hearingAidVolIndex, streamType);

        mDeviceBroker.postSetHearingAidVolumeIndex(hearingAidVolIndex, streamType);
@@ -2672,7 +2672,7 @@ public class AudioDeviceInventory { 
            }

            }





            final int leAudioVolIndex = (volumeIndex == -1)

            final int leAudioVolIndex = (volumeIndex == -1)

                    ? mDeviceBroker.getVssVolumeForDevice(streamType, device)

                    ? mDeviceBroker.getVolumeForDeviceIgnoreMute(streamType, device)

                    : volumeIndex;

                    : volumeIndex;

            final int maxIndex = mDeviceBroker.getMaxVssVolumeForStream(streamType);

            final int maxIndex = mDeviceBroker.getMaxVssVolumeForStream(streamType);

            mDeviceBroker.postSetLeAudioVolumeIndex(leAudioVolIndex, maxIndex, streamType);

            mDeviceBroker.postSetLeAudioVolumeIndex(leAudioVolIndex, maxIndex, streamType);

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -529,7 +529,7 @@ public class AudioService extends IAudioService.Stub 
     */

     */

    private InputDeviceVolumeHelper mInputDeviceVolumeHelper;

    private InputDeviceVolumeHelper mInputDeviceVolumeHelper;

















    /*package*/ int getVssVolumeForDevice(int stream, int device) {







    /*package*/ int getVolumeForDeviceIgnoreMute(int stream, int device) {











        final VolumeStreamState streamState = mStreamStates.get(stream);







        final VolumeStreamState streamState = mStreamStates.get(stream);











        return streamState != null ? streamState.getIndex(device) : -1;







        return streamState != null ? streamState.getIndex(device) : -1;











    }







    }










@@ -5098,7 +5098,7 @@ public class AudioService extends IAudioService.Stub









        }







        }



























        final int device = absVolumeDevices.toArray(new Integer[0])[0].intValue();







        final int device = absVolumeDevices.toArray(new Integer[0])[0].intValue();











        final int index = getStreamVolume(streamType, device);







        final int index = getVolumeForDeviceIgnoreMute(streamType, device);



























        if (DEBUG_VOL) {







        if (DEBUG_VOL) {











            Slog.i(TAG, "onUpdateContextualVolumes streamType: " + streamType







            Slog.i(TAG, "onUpdateContextualVolumes streamType: " + streamType

































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



+1
−1






























Original line number
Original line
Diff line number
Diff line








@@ -724,7 +724,7 @@ public class SoundDoseHelper {









                int device = mAudioService.getDeviceForStream(AudioSystem.STREAM_MUSIC);







                int device = mAudioService.getDeviceForStream(AudioSystem.STREAM_MUSIC);











                if (safeDevicesContains(device) && isStreamActive) {







                if (safeDevicesContains(device) && isStreamActive) {











                    scheduleMusicActiveCheck();







                    scheduleMusicActiveCheck();











                    int index = mAudioService.getVssVolumeForDevice(AudioSystem.STREAM_MUSIC,







                    int index = mAudioService.getVolumeForDeviceIgnoreMute(AudioSystem.STREAM_MUSIC,











                            device);







                            device);











                    if (index > safeMediaVolumeIndex(device)) {







                    if (index > safeMediaVolumeIndex(device)) {











                        // Approximate cumulative active music time







                        // Approximate cumulative active music time