Make the volume keys adjust the media volume by default if the device is not "voice capable."

Change-Id: Ide396f8940a075c0b00b7c983c1769c1cc0f17bf

1 files changed, 12 insertions, 3 deletions

diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java
index 1d9ef65..97fcf27 100644
--- a/media/java/android/media/AudioService.java
+++ b/media/java/android/media/AudioService.java
@@ -85,7 +85,7 @@ public class AudioService extends IAudioService.Stub {
 
     private Context mContext;
     private ContentResolver mContentResolver;
-
+    private boolean mVoiceCapable;
 
     /** The UI */
     private VolumePanel mVolumePanel;
@@ -283,6 +283,8 @@ public class AudioService extends IAudioService.Stub {
     public AudioService(Context context) {
         mContext = context;
         mContentResolver = context.getContentResolver();
+        mVoiceCapable = mContext.getResources().getBoolean(
+                com.android.internal.R.bool.config_voice_capable);
 
        // Intialized volume
         MAX_STREAM_VOLUME[AudioSystem.STREAM_VOICE_CALL] = SystemProperties.getInt(
@@ -1323,8 +1325,15 @@ public class AudioService extends IAudioService.Stub {
             // Log.v(TAG, "getActiveStreamType: Forcing STREAM_MUSIC...");
             return AudioSystem.STREAM_MUSIC;
         } else if (suggestedStreamType == AudioManager.USE_DEFAULT_STREAM_TYPE) {
-            // Log.v(TAG, "getActiveStreamType: Forcing STREAM_RING...");
-            return AudioSystem.STREAM_RING;
+            if (mVoiceCapable) {
+                // Log.v(TAG, "getActiveStreamType: Forcing STREAM_RING..."
+                //        + " b/c USE_DEFAULT_STREAM_TYPE...");
+                return AudioSystem.STREAM_RING;
+            } else {
+                // Log.v(TAG, "getActiveStreamType: Forcing STREAM_MUSIC "
+                //        + " b/c USE_DEFAULT_STREAM_TYPE...");
+                return AudioSystem.STREAM_MUSIC;
+            }
         } else {
             // Log.v(TAG, "getActiveStreamType: Returning suggested type " + suggestedStreamType);
             return suggestedStreamType;