diff options
| author | John Spurlock <jspurlock@google.com> | 2014-07-10 18:07:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-10 00:46:47 +0000 |
| commit | cd22c3ec5349be6432dc4dc5a61f99ad4ff03263 (patch) | |
| tree | ea9a8f6d3ff528017d39cda7d6e7a683c383b088 | |
| parent | aef5fcdcb5ff13cbdc64f18b315750b8a9a7fe3e (diff) | |
| parent | 6bd096c8d608197535a6a6a26663fd1e717246de (diff) | |
| download | frameworks_base-cd22c3ec5349be6432dc4dc5a61f99ad4ff03263.zip frameworks_base-cd22c3ec5349be6432dc4dc5a61f99ad4ff03263.tar.gz frameworks_base-cd22c3ec5349be6432dc4dc5a61f99ad4ff03263.tar.bz2 | |
Merge "Volume: allow dialog to play sound over keyguard."
| -rw-r--r-- | media/java/android/media/AudioService.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java index f262390..7316e14 100644 --- a/media/java/android/media/AudioService.java +++ b/media/java/android/media/AudioService.java @@ -850,11 +850,10 @@ public class AudioService extends IAudioService.Stub { streamType = getActiveStreamType(suggestedStreamType); } - // Play sounds on STREAM_RING only and if lock screen is not on. + // Play sounds on STREAM_RING and STREAM_REMOTE_MUSIC only. if ((streamType != STREAM_REMOTE_MUSIC) && (flags & AudioManager.FLAG_PLAY_SOUND) != 0 && - ((mStreamVolumeAlias[streamType] != AudioSystem.STREAM_RING) - || (mKeyguardManager != null && mKeyguardManager.isKeyguardLocked()))) { + (mStreamVolumeAlias[streamType] != AudioSystem.STREAM_RING)) { flags &= ~AudioManager.FLAG_PLAY_SOUND; } |