Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 965f22ba authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Android Git Automerger
Browse files

am 3b5d9515: Merge "Fix bug 3395289 Use MODE_IN_COMMUNICATION to evaluate... 

am 3b5d9515: Merge "Fix bug 3395289 Use MODE_IN_COMMUNICATION to evaluate stream vol changes" into honeycomb

* commit '3b5d9515':
  Fix bug 3395289 Use MODE_IN_COMMUNICATION to evaluate stream vol changes
parents d07094a1 3b5d9515

media/java/android/media/AudioService.java

+1 −1
Original line number Diff line number Diff line
@@ -1450,7 +1450,7 @@ public class AudioService extends IAudioService.Stub { 
        if (AudioSystem.getForceUse(AudioSystem.FOR_COMMUNICATION) == AudioSystem.FORCE_BT_SCO) {

            // Log.v(TAG, "getActiveStreamType: Forcing STREAM_BLUETOOTH_SCO...");

            return AudioSystem.STREAM_BLUETOOTH_SCO;

        } else if (isOffhook || AudioSystem.isStreamActive(AudioSystem.STREAM_VOICE_CALL)) {

        } else if (isOffhook || getMode() == AudioManager.MODE_IN_COMMUNICATION) {

            // Log.v(TAG, "getActiveStreamType: Forcing STREAM_VOICE_CALL...");

            return AudioSystem.STREAM_VOICE_CALL;

        } else if (AudioSystem.isStreamActive(AudioSystem.STREAM_MUSIC)) {