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

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

Browse Source 
Merge commit 'def7db5b79e5c178834375020ef6b590e80af42f' into kraken

* commit 'def7db5b79e5c178834375020ef6b590e80af42f':
  Fix issue 2592680: Saved ringer volume forced to 0 when receiving a call in silent mode.
This commit is contained in:
Eric Laurent
2010-04-14 12:15:18 -07:00
committed by Android Git Automerger
parent a976eccf6b def7db5b79
commit 5c14f2d08f
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);
}
}
}