Index: media/base/android/java/src/org/chromium/media/AudioManagerAndroid.java |
diff --git a/media/base/android/java/src/org/chromium/media/AudioManagerAndroid.java b/media/base/android/java/src/org/chromium/media/AudioManagerAndroid.java |
index 4a6f4ad30eaaf1ac8c45b09fbe4b0bfd7dc75041..9f5a49d76af89e4fb62610fe85a576d2eaa1cdd2 100644 |
--- a/media/base/android/java/src/org/chromium/media/AudioManagerAndroid.java |
+++ b/media/base/android/java/src/org/chromium/media/AudioManagerAndroid.java |
@@ -4,6 +4,7 @@ |
package org.chromium.media; |
+import android.annotation.TargetApi; |
import android.bluetooth.BluetoothAdapter; |
import android.bluetooth.BluetoothManager; |
import android.content.BroadcastReceiver; |
@@ -70,18 +71,6 @@ class AudioManagerAndroid { |
} |
} |
- private static boolean runningOnJellyBeanOrHigher() { |
- return Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN; |
- } |
- |
- private static boolean runningOnJellyBeanMR1OrHigher() { |
- return Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1; |
- } |
- |
- private static boolean runningOnJellyBeanMR2OrHigher() { |
- return Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2; |
- } |
- |
/** Simple container for device information. */ |
private static class AudioDeviceName { |
private final int mId; |
@@ -455,9 +444,10 @@ class AudioManagerAndroid { |
return array; |
} |
+ @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1) |
@CalledByNative |
private int getNativeOutputSampleRate() { |
- if (runningOnJellyBeanMR1OrHigher()) { |
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { |
String sampleRateString = mAudioManager.getProperty( |
AudioManager.PROPERTY_OUTPUT_SAMPLE_RATE); |
return sampleRateString == null |
@@ -513,18 +503,23 @@ class AudioManagerAndroid { |
PackageManager.FEATURE_AUDIO_LOW_LATENCY); |
} |
+ @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1) |
@CalledByNative |
private int getAudioLowLatencyOutputFrameSize() { |
+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1) { |
+ return DEFAULT_FRAME_PER_BUFFER; |
+ } |
String framesPerBuffer = |
mAudioManager.getProperty(AudioManager.PROPERTY_OUTPUT_FRAMES_PER_BUFFER); |
return framesPerBuffer == null |
? DEFAULT_FRAME_PER_BUFFER : Integer.parseInt(framesPerBuffer); |
} |
+ @TargetApi(Build.VERSION_CODES.JELLY_BEAN) |
@CalledByNative |
private static boolean shouldUseAcousticEchoCanceler() { |
// AcousticEchoCanceler was added in API level 16 (Jelly Bean). |
- if (!runningOnJellyBeanOrHigher()) { |
+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) { |
return false; |
} |
@@ -642,6 +637,7 @@ class AudioManagerAndroid { |
* android.bluetooth.BluetoothAdapter.getProfileConnectionState() requires |
* the BLUETOOTH permission. |
*/ |
+ @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2) |
private boolean hasBluetoothHeadset() { |
if (!mHasBluetoothPermission) { |
Log.w(TAG, "hasBluetoothHeadset() requires BLUETOOTH permission"); |
@@ -654,7 +650,7 @@ class AudioManagerAndroid { |
// higher, retrieve it through getSystemService(String) with |
// BLUETOOTH_SERVICE. |
BluetoothAdapter btAdapter = null; |
- if (runningOnJellyBeanMR2OrHigher()) { |
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) { |
// Use BluetoothManager to get the BluetoothAdapter for |
// Android 4.3 and above. |
BluetoothManager btManager = |