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

Fix issue 2592680: Saved ringer volume forced to 0 when receiving a call in silent mode.

Browse Source 
This is a regression introduced by change 5b4e654d0c for issue 2472495.
When AudioService changes audio mode, setMode() reapplies current volume for the default active stream
which in this case is STREAM_RING.
Because the new implementation of silent mode actually mutes the ringer stream,
setStreamVolumeInt() now applies the volume change received while in silent mode
to the last audible value and we end up clearing the last audible volume for ringer.

The fix consists in not modifying last audible value when the new value is 0.

Also removed obsolete code in setStreamVolumeInt() since new implementation of setRingerModeInt()
in change 5b4e654d0c.

Change-Id: I746f3bc1af39a602ce12d130ce592007b2d0ebb6
This commit is contained in:
Eric Laurent
2010-04-13 10:38:05 -07:00
parent 745b43c28f
commit 758dd527f6
1 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -492,27 +492,19 @@ public class AudioService extends IAudioService.Stub {
// If stream is muted, set last audible index only
if (streamState.muteCount() != 0) {
streamState.setLastAudibleIndex(index);
// Post a persist volume msg
sendMsg(mAudioHandler, MSG_PERSIST_VOLUME, streamType,
SENDMSG_REPLACE, 0, 1, streamState, PERSIST_DELAY);
// Do not allow last audible index to be 0
if (index != 0) {
streamState.setLastAudibleIndex(index);
// Post a persist volume msg
sendMsg(mAudioHandler, MSG_PERSIST_VOLUME, streamType,
SENDMSG_REPLACE, 0, 1, streamState, PERSIST_DELAY);
}
} else {
if (streamState.setIndex(index, lastAudible) || force) {
// Post message to set system volume (it in turn will post a message
// to persist).
// If we are in silent mode and stream is affected by ringer mode
// and the new volume is not 0, just persist the new volume but do not change
// current value
if (mRingerMode == AudioManager.RINGER_MODE_NORMAL ||
!isStreamAffectedByRingerMode(streamType) ||
index == 0) {
sendMsg(mAudioHandler, MSG_SET_SYSTEM_VOLUME, streamType, SENDMSG_NOOP, 0, 0,
streamState, 0);
} else {
// Post a persist volume msg
sendMsg(mAudioHandler, MSG_PERSIST_VOLUME, streamType,
SENDMSG_REPLACE, 0, 1, streamState, PERSIST_DELAY);
}
sendMsg(mAudioHandler, MSG_SET_SYSTEM_VOLUME, streamType, SENDMSG_NOOP, 0, 0,
streamState, 0);
}
}
}