Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Issue 3371080: fix volume update in mute state." into honeycomb

Browse Source
This commit is contained in:
Jim Miller
2011-02-03 18:29:36 -08:00
committed by Android (Google) Code Review
parent 4fe3e53e85 0f31fe0968
commit 4ce0cad1b3
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/preference/VolumePreference.java
View File

@@ -236,14 +236,11 @@ 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) {
mSeekBar.setProgress(volume);
}
if (mSeekBar != null && mAudioManager != null) {
int volume = mAudioManager.isStreamMute(mStreamType) ?
mAudioManager.getLastAudibleStreamVolume(mStreamType)
: mAudioManager.getStreamVolume(mStreamType);
mSeekBar.setProgress(volume);
}
}
};