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

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

Use step factor when posting HA new vol index 

Since the attenuation is computed from the APM volume curves, whenever
we post the HA new vol index, we need to take into account the index
step factor.

Test: manual
Bug: 394977932
Flag: EXEMPT bugfix
Change-Id: I0135502a71c297d3ee10378b339ece420c318774
parent 84abf764

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

+21 −3
Original line number Diff line number Diff line
@@ -4188,7 +4188,13 @@ public class AudioService extends IAudioService.Stub 
                    Log.d(TAG, "adjustStreamVolume postSetHearingAidVolumeIndex index="

                            + newIndex + " stream=" + streamType);

                }

                mDeviceBroker.postSetHearingAidVolumeIndex(newIndex, streamType);

                int haIndex;

                final VolumeStreamState vss = getVssForStreamOrDefault(streamType);

                synchronized (mVolumeStateLock) {

                    haIndex = (int) (vss.getMinIndex() + (newIndex - vss.getMinIndex())

                            / vss.getIndexStepFactor());

                }

                mDeviceBroker.postSetHearingAidVolumeIndex(haIndex, streamType);

            }

        }










@@ -5126,7 +5132,13 @@ public class AudioService extends IAudioService.Stub













            mDeviceBroker.postSetLeAudioVolumeIndex(index * 10,















                    getVssForStreamOrDefault(streamType).getMaxIndex(), streamType);















        } else if (device == AudioSystem.DEVICE_OUT_HEARING_AID) {













            mDeviceBroker.postSetHearingAidVolumeIndex(index * 10, streamType);













            int haIndex = index * 10;













            final VolumeStreamState vss = getVssForStreamOrDefault(streamType);













            synchronized (mVolumeStateLock) {













                haIndex = (int) (vss.getMinIndex()













                        + (haIndex - vss.getMinIndex()) / vss.getIndexStepFactor());













            }













            mDeviceBroker.postSetHearingAidVolumeIndex(haIndex, streamType);















        } else if (AudioSystem.DEVICE_OUT_ALL_A2DP_SET.contains(device)) {















            mDeviceBroker.postSetAvrcpAbsoluteVolumeIndex(index);















        } else {










@@ -5257,7 +5269,13 @@ public class AudioService extends IAudioService.Stub













                && streamType == getBluetoothContextualVolumeStream()) {















            Log.i(TAG, "setStreamVolume postSetHearingAidVolumeIndex index=" + index















                    + " stream=" + streamType);













            mDeviceBroker.postSetHearingAidVolumeIndex(index, streamType);













            int haIndex;













            final VolumeStreamState vss = getVssForStreamOrDefault(streamType);













            synchronized (mVolumeStateLock) {













                haIndex = (int) (vss.getMinIndex()













                        + (index - vss.getMinIndex()) / vss.getIndexStepFactor());













            }













            mDeviceBroker.postSetHearingAidVolumeIndex(haIndex, streamType);















        }





























        synchronized (mHdmiClientLock) {