Index: webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioUtils.java |
diff --git a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioUtils.java b/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioUtils.java |
index 579482e14b88d27ef285a37b73cf378e9fd53851..fecefc75c3c3736494d16543854d0085a4d49806 100644 |
--- a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioUtils.java |
+++ b/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioUtils.java |
@@ -169,11 +169,10 @@ public final class WebRtcAudioUtils { |
return Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP; |
} |
- // TODO(phoglund): enable when all downstream users use M. |
- // public static boolean runningOnMOrHigher() { |
+ public static boolean runningOnMarshmallowOrHigher() { |
// API Level 23. |
- // return Build.VERSION.SDK_INT >= Build.VERSION_CODES.M; |
- //} |
+ return Build.VERSION.SDK_INT >= Build.VERSION_CODES.M; |
+ } |
// Helper method for building a string of thread information. |
public static String getThreadInfo() { |