diff options
author | Amith Yamasani <yamasani@google.com> | 2011-12-06 16:59:44 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-06 16:59:44 -0800 |
commit | 9c316f3c6ac785fd27be97a119dfe8f1303a8ed4 (patch) | |
tree | ca073d5c34840f6fac41900d3bced91c38cd2379 /media | |
parent | e49e8cc4e799a2a6793c148b6a4b74d8f69026dd (diff) | |
parent | d49ec62cfb0469c39f2b5d79cbf2a6f69cceb7d7 (diff) | |
download | frameworks_base-9c316f3c6ac785fd27be97a119dfe8f1303a8ed4.zip frameworks_base-9c316f3c6ac785fd27be97a119dfe8f1303a8ed4.tar.gz frameworks_base-9c316f3c6ac785fd27be97a119dfe8f1303a8ed4.tar.bz2 |
am d49ec62c: am f3364080: Merge "New and improved silent mode on lockscreen." into ics-mr1
* commit 'd49ec62cfb0469c39f2b5d79cbf2a6f69cceb7d7':
New and improved silent mode on lockscreen.
Diffstat (limited to 'media')
-rw-r--r-- | media/java/android/media/AudioService.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java index 3b55246..c201417 100644 --- a/media/java/android/media/AudioService.java +++ b/media/java/android/media/AudioService.java @@ -21,6 +21,7 @@ import static android.media.AudioManager.RINGER_MODE_SILENT; import static android.media.AudioManager.RINGER_MODE_VIBRATE; import android.app.ActivityManagerNative; +import android.app.KeyguardManager; import android.app.PendingIntent; import android.app.PendingIntent.CanceledException; import android.bluetooth.BluetoothA2dp; @@ -319,6 +320,8 @@ public class AudioService extends IAudioService.Stub { private static final int NOTIFICATION_VOLUME_DELAY_MS = 5000; // previous volume adjustment direction received by checkForRingerModeChange() private int mPrevVolDirection = AudioManager.ADJUST_SAME; + // Keyguard manager proxy + private KeyguardManager mKeyguardManager; /////////////////////////////////////////////////////////////////////////// // Construction @@ -503,9 +506,10 @@ public class AudioService extends IAudioService.Stub { streamType = getActiveStreamType(suggestedStreamType); } - // Play sounds on STREAM_RING only. + // Play sounds on STREAM_RING only and if lock screen is not on. if ((flags & AudioManager.FLAG_PLAY_SOUND) != 0 && - ((STREAM_VOLUME_ALIAS[streamType] != AudioSystem.STREAM_RING))) { + ((STREAM_VOLUME_ALIAS[streamType] != AudioSystem.STREAM_RING) + || (mKeyguardManager != null && mKeyguardManager.isKeyguardLocked()))) { flags &= ~AudioManager.FLAG_PLAY_SOUND; } @@ -2659,6 +2663,8 @@ public class AudioService extends IAudioService.Stub { sendMsg(mAudioHandler, MSG_LOAD_SOUND_EFFECTS, SHARED_MSG, SENDMSG_NOOP, 0, 0, null, 0); + mKeyguardManager = + (KeyguardManager) mContext.getSystemService(Context.KEYGUARD_SERVICE); mScoConnectionState = AudioManager.SCO_AUDIO_STATE_ERROR; resetBluetoothSco(); getBluetoothHeadset(); |