diff options
author | Eric Laurent <elaurent@google.com> | 2009-11-27 05:07:55 -0800 |
---|---|---|
committer | Eric Laurent <elaurent@google.com> | 2009-11-27 05:07:55 -0800 |
commit | 524dc046b1225087f481878a5c3ae7f733c9f0e2 (patch) | |
tree | 27cfbc540b394b8a0a80e20658ee20842f178530 /media | |
parent | bcab01f6d0158c4d928f42b034949dc9608665a6 (diff) | |
download | frameworks_base-524dc046b1225087f481878a5c3ae7f733c9f0e2.zip frameworks_base-524dc046b1225087f481878a5c3ae7f733c9f0e2.tar.gz frameworks_base-524dc046b1225087f481878a5c3ae7f733c9f0e2.tar.bz2 |
Fix issue 2192673: Music Pausing Even when notifications are set to silent.
Do not play ringtones, notifications or camera sounds if ringer mode is silent.
Diffstat (limited to 'media')
-rw-r--r-- | media/java/android/media/Ringtone.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/media/java/android/media/Ringtone.java b/media/java/android/media/Ringtone.java index e80d8aa..f988d2b 100644 --- a/media/java/android/media/Ringtone.java +++ b/media/java/android/media/Ringtone.java @@ -63,11 +63,13 @@ public class Ringtone { private AssetFileDescriptor mAssetFileDescriptor; private int mStreamType = AudioManager.STREAM_RING; + private AudioManager mAudioManager; private Context mContext; Ringtone(Context context) { mContext = context; + mAudioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE); } /** @@ -209,7 +211,11 @@ public class Ringtone { } } if (mAudio != null) { - mAudio.start(); + // do not ringtones if stream volume is 0 + // (typically because ringer mode is silent). + if (mAudioManager.getStreamVolume(mStreamType) != 0) { + mAudio.start(); + } } } |