diff options
author | Amith Yamasani <yamasani@google.com> | 2011-12-01 14:01:30 -0800 |
---|---|---|
committer | Amith Yamasani <yamasani@google.com> | 2011-12-01 15:05:54 -0800 |
commit | 2ef6f1bb5603c2e221191117695725237f49a5d5 (patch) | |
tree | 3bcbff95c91f81308cd8520563b28179df796e59 /media | |
parent | 0433c157141b9122f6c61498e909770f1db27c7c (diff) | |
download | frameworks_base-2ef6f1bb5603c2e221191117695725237f49a5d5.zip frameworks_base-2ef6f1bb5603c2e221191117695725237f49a5d5.tar.gz frameworks_base-2ef6f1bb5603c2e221191117695725237f49a5d5.tar.bz2 |
Further volume improvements.
- Remove silent mode from Power menu
- Show volume dialog on lockscreen
- Allow beeps when adjusting volume in lockscreen
Bug: 5586083
Change-Id: I93052a8ec5004c784f20e04488af9382d495e711
Diffstat (limited to 'media')
-rw-r--r-- | media/java/android/media/AudioService.java | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java index 5e7a7eb..afb28a8 100644 --- a/media/java/android/media/AudioService.java +++ b/media/java/android/media/AudioService.java @@ -21,7 +21,6 @@ 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; @@ -320,8 +319,6 @@ 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 @@ -506,10 +503,9 @@ 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 only. if ((flags & AudioManager.FLAG_PLAY_SOUND) != 0 && - ((STREAM_VOLUME_ALIAS[streamType] != AudioSystem.STREAM_RING) || - (mKeyguardManager != null && mKeyguardManager.isKeyguardLocked()))) { + ((STREAM_VOLUME_ALIAS[streamType] != AudioSystem.STREAM_RING))) { flags &= ~AudioManager.FLAG_PLAY_SOUND; } @@ -2595,8 +2591,6 @@ 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(); |