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

Merge "AudioService: filter flags in volume methods" into jb-mr1-dev

Browse Source
This commit is contained in:
Eric Laurent
2012-10-04 08:44:25 -07:00
committed by Android (Google) Code Review
parent 6295ef3251 799448bee1
commit 31fed73701
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/java/android/media/AudioService.java
View File

@@ -733,7 +733,7 @@ public class AudioService extends IAudioService.Stub implements OnFinished {
if (streamType == STREAM_REMOTE_MUSIC) {
// don't play sounds for remote
flags &= ~AudioManager.FLAG_PLAY_SOUND;
flags &= ~(AudioManager.FLAG_PLAY_SOUND|AudioManager.FLAG_FIXED_VOLUME);
//if (DEBUG_VOL) Log.i(TAG, "Need to adjust remote volume: calling adjustRemoteVolume()");
adjustRemoteVolume(AudioSystem.STREAM_MUSIC, direction, flags);
} else {
@@ -771,6 +771,7 @@ public class AudioService extends IAudioService.Stub implements OnFinished {
int index;
int oldIndex;
flags &= ~AudioManager.FLAG_FIXED_VOLUME;
if ((streamTypeAlias == AudioSystem.STREAM_MUSIC) &&
((device & mFixedVolumeDevices) != 0)) {
flags |= AudioManager.FLAG_FIXED_VOLUME;
@@ -855,6 +856,7 @@ public class AudioService extends IAudioService.Stub implements OnFinished {
final int device = getDeviceForStream(streamType);
int oldIndex;
flags &= ~AudioManager.FLAG_FIXED_VOLUME;
if ((mStreamVolumeAlias[streamType] == AudioSystem.STREAM_MUSIC) &&
((device & mFixedVolumeDevices) != 0)) {
flags |= AudioManager.FLAG_FIXED_VOLUME;