From 3296256f0e710a4d87571df17b20eb68283112fb Mon Sep 17 00:00:00 2001 From: henrika Date: Fri, 21 Jul 2017 07:28:41 -0700 Subject: [PATCH] Fixing lint issue NOTRY=TRUE BUG=NONE Review-Url: https://codereview.webrtc.org/2988533002 Cr-Commit-Position: refs/heads/master@{#19110} --- .../org/webrtc/voiceengine/WebRtcAudioTrack.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioTrack.java b/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioTrack.java index f4803ba94a..ac6c877266 100644 --- a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioTrack.java +++ b/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioTrack.java @@ -44,7 +44,7 @@ public class WebRtcAudioTrack { // By default, WebRTC creates audio tracks with a usage attribute // corresponding to voice communications, such as telephony or VoIP. - private static final int DEFAULT_USAGE = AudioAttributes.USAGE_VOICE_COMMUNICATION; + private static final int DEFAULT_USAGE = getDefaultUsageAttribute(); private static int usageAttribute = DEFAULT_USAGE; // This method overrides the default usage attribute and allows the user @@ -56,6 +56,20 @@ public class WebRtcAudioTrack { usageAttribute = usage; } + private static int getDefaultUsageAttribute() { + if (WebRtcAudioUtils.runningOnLollipopOrHigher()) { + return getDefaultUsageAttributeOnLollipopOrHigher(); + } else { + // Not used on SDKs lower than L. + return 0; + } + } + + @TargetApi(21) + private static int getDefaultUsageAttributeOnLollipopOrHigher() { + return AudioAttributes.USAGE_VOICE_COMMUNICATION; + } + private final long nativeAudioTrack; private final AudioManager audioManager;