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

Commit 6572cfe8 authored by Jim Miller's avatar Jim Miller Committed by Android Git Automerger
Browse files

am da983f73: am 4ce0cad1: Merge "Issue 3371080: fix volume update in mute state." into honeycomb 

* commit 'da983f73':
  Issue 3371080: fix volume update in mute state.
parents 1514a5ec da983f73

core/java/android/preference/VolumePreference.java

+5 −8
Original line number Diff line number Diff line
@@ -236,16 +236,13 @@ public class VolumePreference extends SeekBarPreference implements 
            @Override

            public void onChange(boolean selfChange) {

                super.onChange(selfChange);

                if (mSeekBar != null) {

                    int volume = System.getInt(mContext.getContentResolver(),

                            System.VOLUME_SETTINGS[mStreamType], -1);

                    // Works around an atomicity problem with volume updates

                    // TODO: Fix the actual issue, probably in AudioService

                    if (volume >= 0) {

                if (mSeekBar != null && mAudioManager != null) {

                    int volume = mAudioManager.isStreamMute(mStreamType) ?

                            mAudioManager.getLastAudibleStreamVolume(mStreamType)

                            : mAudioManager.getStreamVolume(mStreamType);

                    mSeekBar.setProgress(volume);

                }

            }

            }

        };



        public SeekBarVolumizer(Context context, SeekBar seekBar, int streamType) {