diff options
author | Eric Laurent <elaurent@google.com> | 2010-04-14 12:15:18 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-14 12:15:18 -0700 |
commit | 5c14f2d08fb01be02b4952904c0f07464882653d (patch) | |
tree | 33a74abb5753b2b73dc5bd8ead283ba0686f92bf | |
parent | a976eccf6b739d209bb66502d9406579a3d80f8f (diff) | |
parent | def7db5b79e5c178834375020ef6b590e80af42f (diff) | |
download | frameworks_base-5c14f2d08fb01be02b4952904c0f07464882653d.zip frameworks_base-5c14f2d08fb01be02b4952904c0f07464882653d.tar.gz frameworks_base-5c14f2d08fb01be02b4952904c0f07464882653d.tar.bz2 |
am def7db5b: am 758dd527: Fix issue 2592680: Saved ringer volume forced to 0 when receiving a call in silent mode.
Merge commit 'def7db5b79e5c178834375020ef6b590e80af42f' into kraken
* commit 'def7db5b79e5c178834375020ef6b590e80af42f':
Fix issue 2592680: Saved ringer volume forced to 0 when receiving a call in silent mode.
-rw-r--r-- | media/java/android/media/AudioService.java | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java index 3e38e53..a38be48 100644 --- a/media/java/android/media/AudioService.java +++ b/media/java/android/media/AudioService.java @@ -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); } } } |