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

Commit cac2381c authored by Eric Laurent's avatar Eric Laurent
Browse files

audioservice: fix volume index rescaling in updateDefaultVolumes() 

Fix mistake in updateDefaultVolumes() where index given to
rescaleIndex() was in UI range and not in internal x10 range.

Also move all volume debug log under DEBUG_VOL condition.

Bug: 136121584
Test: make
Change-Id: I239145d8bc50237ff902026594423c6d1fa04ad4
parent 8a45b969

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

+34 −19
Original line number Diff line number Diff line
@@ -1326,10 +1326,10 @@ public class AudioService extends IAudioService.Stub 
    private void updateDefaultVolumes() {

        for (int stream = 0; stream < mStreamStates.length; stream++) {

            if (stream != mStreamVolumeAlias[stream]) {

                AudioSystem.DEFAULT_STREAM_VOLUME[stream] = rescaleIndex(

                        AudioSystem.DEFAULT_STREAM_VOLUME[mStreamVolumeAlias[stream]],

                AudioSystem.DEFAULT_STREAM_VOLUME[stream] = (rescaleIndex(

                        AudioSystem.DEFAULT_STREAM_VOLUME[mStreamVolumeAlias[stream]] * 10,

                        mStreamVolumeAlias[stream],

                        stream);

                        stream) + 5) / 10;

            }

        }

    }
@@ -4742,7 +4742,9 @@ public class AudioService extends IAudioService.Stub 
            } catch (IllegalArgumentException e) {

                // Volume Groups without attributes are not controllable through set/get volume

                // using attributes. Do not append them.

                if (DEBUG_VOL) {

                    Log.d(TAG, "volume group " + avg.name() + " for internal policy needs");

                }

                continue;

            }

            sVolumeGroupStates.append(avg.getId(), new VolumeGroupState(avg));
@@ -4763,7 +4765,9 @@ public class AudioService extends IAudioService.Stub 
    }



    private void readVolumeGroupsSettings() {

        if (DEBUG_VOL) {

            Log.v(TAG, "readVolumeGroupsSettings");

        }

        for (int i = 0; i < sVolumeGroupStates.size(); i++) {

            final VolumeGroupState vgs = sVolumeGroupStates.valueAt(i);

            vgs.readSettings();
@@ -4773,7 +4777,9 @@ public class AudioService extends IAudioService.Stub 


    // Called upon crash of AudioServer

    private void restoreVolumeGroups() {

        if (DEBUG_VOL) {

            Log.v(TAG, "restoreVolumeGroups");

        }

        for (int i = 0; i < sVolumeGroupStates.size(); i++) {

            final VolumeGroupState vgs = sVolumeGroupStates.valueAt(i);

            vgs.applyAllVolumes();
@@ -4809,7 +4815,9 @@ public class AudioService extends IAudioService.Stub 


        private VolumeGroupState(AudioVolumeGroup avg) {

            mAudioVolumeGroup = avg;

            if (DEBUG_VOL) {

                Log.v(TAG, "VolumeGroupState for " + avg.toString());

            }

            for (final AudioAttributes aa : avg.getAudioAttributes()) {

                if (!aa.equals(AudioProductStrategy.sDefaultAttributes)) {

                    mAudioAttributes = aa;
@@ -4912,16 +4920,21 @@ public class AudioService extends IAudioService.Stub 
                    final int device = mIndexMap.keyAt(i);

                    if (device != AudioSystem.DEVICE_OUT_DEFAULT) {

                        index = mIndexMap.valueAt(i);

                        if (DEBUG_VOL) {

                            Log.v(TAG, "applyAllVolumes: restore index " + index + " for group "

                                    + mAudioVolumeGroup.name() + " and device "

                                    + AudioSystem.getOutputDeviceName(device));

                        }

                        setVolumeIndexInt(index, device, 0 /*flags*/);

                    }

                }

                // apply default volume last: by convention , default device volume will be used

                // by audio policy manager if no explicit volume is present for a given device type

                index = getIndex(AudioSystem.DEVICE_OUT_DEFAULT);

                Log.v(TAG, "applyAllVolumes: restore default device index " + index + " for group "

                        + mAudioVolumeGroup.name());

                if (DEBUG_VOL) {

                    Log.v(TAG, "applyAllVolumes: restore default device index " + index

                            + " for group " + mAudioVolumeGroup.name());

                }

                setVolumeIndexInt(index, AudioSystem.DEVICE_OUT_DEFAULT, 0 /*flags*/);

            }

        }
@@ -4930,9 +4943,11 @@ public class AudioService extends IAudioService.Stub 
            if (mUseFixedVolume) {

                return;

            }

            if (DEBUG_VOL) {

                Log.v(TAG, "persistVolumeGroup: storing index " + getIndex(device) + " for group "

                        + mAudioVolumeGroup.name() + " and device "

                        + AudioSystem.getOutputDeviceName(device));

            }

            boolean success = Settings.System.putIntForUser(mContentResolver,

                    getSettingNameForDevice(device),

                    getIndex(device),
@@ -4962,12 +4977,12 @@ public class AudioService extends IAudioService.Stub 
                    index = Settings.System.getIntForUser(

                            mContentResolver, name, defaultIndex, UserHandle.USER_CURRENT);

                    if (index == -1) {

                        Log.e(TAG, "readSettings: No index stored for group "

                                + mAudioVolumeGroup.name() + ", device " + name);

                        continue;

                    }

                    if (DEBUG_VOL) {

                        Log.v(TAG, "readSettings: found stored index " + getValidIndex(index)

                                 + " for group " + mAudioVolumeGroup.name() + ", device: " + name);

                    }

                    mIndexMap.put(device, getValidIndex(index));

                }

            }