summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--media/java/android/media/AudioService.java5
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;
}