OSDN Git Service

Fix issue 3371080
authorEric Laurent <elaurent@google.com>
Wed, 2 Feb 2011 17:33:30 +0000 (09:33 -0800)
committerEric Laurent <elaurent@google.com>
Thu, 3 Feb 2011 17:26:24 +0000 (09:26 -0800)
commit25101b0b9a84571ead15b26e9f4cd9c4298d7823
tree8f339bdcc562671cd425144be54841f39c56754b
parent1cee14f154aadabcd9990bd73a197fbd744660ad
Fix issue 3371080

Modified default volume control logic in AudioService:
1 IN_CALL volume if in video/audio chat
2 NOTIFICATION if notification is playing or was playing less than 5s ago.
3 MUSIC

Modified silent mode:
- now also affect MUSIC stream type
- entering silent mode when VOL- hard key is pressed once while selected
stream volume is already at 0 (except for VOICE_CALL stream).
- exiting silent mode when pressing VOL+ hard key while in silent mode

Play sound FX (audible selections, keyboard clicks) at a fixed volume.

Modified audio framework:
- isStreamActive() method now implemented in AudioPolicyManagerBase (previously AudioFlinger)
- iStreamActive() now specifies a time window during which the stream is considered
active after it actually stopped.

Change-Id: I7e5a0724099450b9fc90825224180ac97322785f
17 files changed:
core/jni/android_media_AudioSystem.cpp
include/media/AudioSystem.h
include/media/IAudioFlinger.h
include/media/IAudioPolicyService.h
media/java/android/media/AudioManager.java
media/java/android/media/AudioService.java
media/java/android/media/AudioSystem.java
media/java/android/media/IAudioService.aidl
media/libmedia/AudioSystem.cpp
media/libmedia/IAudioFlinger.cpp
media/libmedia/IAudioPolicyService.cpp
packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
services/audioflinger/AudioFlinger.cpp
services/audioflinger/AudioFlinger.h
services/audioflinger/AudioPolicyManagerBase.cpp
services/audioflinger/AudioPolicyService.cpp
services/audioflinger/AudioPolicyService.h