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

Commit 41df7528 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Automerger Merge Worker
Browse files

Merge "AudioDeviceVolumeManager.getDeviceVolume fix returned VolumeInfo" into... 

Merge "AudioDeviceVolumeManager.getDeviceVolume fix returned VolumeInfo" into udc-dev am: 0f453337

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



Change-Id: Icfa56e77889d3912851ece644b910a316872ec76
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fdce5974 0f453337

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

+7 −3
Original line number Diff line number Diff line
@@ -4993,8 +4993,8 @@ public class AudioService extends IAudioService.Stub 














        int streamType = vi.getStreamType();















        final VolumeInfo.Builder vib = new VolumeInfo.Builder(vi);













        vib.setMinVolumeIndex(mStreamStates[streamType].mIndexMin);













        vib.setMaxVolumeIndex(mStreamStates[streamType].mIndexMax);













        vib.setMinVolumeIndex((mStreamStates[streamType].mIndexMin + 5) / 10);













        vib.setMaxVolumeIndex((mStreamStates[streamType].mIndexMax + 5) / 10);















        synchronized (VolumeStreamState.class) {















            final int index;















            if (isFixedVolumeDevice(ada.getInternalType())) {









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













                index = (mStreamStates[streamType].getIndex(ada.getInternalType()) + 5) / 10;















            }















            vib.setVolumeIndex(index);













            return vib.setMuted(mStreamStates[streamType].mIsMuted).build();













            // only set as a mute command if stream muted













            if (mStreamStates[streamType].mIsMuted) {













                vib.setMuted(true);













            }













            return vib.build();















        }















    }