Remove ICS support from Chromium code.

minSkd is now 16, so we no longer need to support ICS. This
code removes some of that support in base/content/media/ui.

BUG=473837

Review URL: https://codereview.chromium.org/1123823002

Cr-Commit-Position: refs/heads/master@{#328244}

4 files changed, 3 insertions, 20 deletions

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 47f8bb0..c520e34 100644
--- a/media/base/android/java/src/org/chromium/media/AudioManagerAndroid.java
+++ b/media/base/android/java/src/org/chromium/media/AudioManagerAndroid.java
@@ -511,14 +511,8 @@ class AudioManagerAndroid {
                 ? 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 (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) {
-            return false;
-        }
-
         // Verify that this device is among the supported/tested models.
         List<String> supportedModels = Arrays.asList(SUPPORTED_AEC_MODELS);
         if (!supportedModels.contains(Build.MODEL)) {
diff --git a/media/base/android/java/src/org/chromium/media/MediaCodecBridge.java b/media/base/android/java/src/org/chromium/media/MediaCodecBridge.java
index 5f0b298..018c475 100644
--- a/media/base/android/java/src/org/chromium/media/MediaCodecBridge.java
+++ b/media/base/android/java/src/org/chromium/media/MediaCodecBridge.java
@@ -31,7 +31,6 @@ import java.util.Map;
  * audio rendering.
  */
 @JNINamespace("media")
-@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
 class MediaCodecBridge {
     private static final String TAG = "MediaCodecBridge";
 
diff --git a/media/base/android/java/src/org/chromium/media/VideoCaptureAndroid.java b/media/base/android/java/src/org/chromium/media/VideoCaptureAndroid.java
index a6e99bb..21def1f 100644
--- a/media/base/android/java/src/org/chromium/media/VideoCaptureAndroid.java
+++ b/media/base/android/java/src/org/chromium/media/VideoCaptureAndroid.java
@@ -30,10 +30,6 @@ public class VideoCaptureAndroid extends VideoCaptureCamera {
         };
 
         static int getImageFormat() {
-            if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.JELLY_BEAN) {
-                return ImageFormat.NV21;
-            }
-
             for (String buggyDevice : COLORSPACE_BUGGY_DEVICE_LIST) {
                 if (buggyDevice.contentEquals(android.os.Build.MODEL)) {
                     return ImageFormat.NV21;
diff --git a/media/base/android/java/src/org/chromium/media/WebAudioMediaCodecBridge.java b/media/base/android/java/src/org/chromium/media/WebAudioMediaCodecBridge.java
index c86ebcb..2d3b9e4 100644
--- a/media/base/android/java/src/org/chromium/media/WebAudioMediaCodecBridge.java
+++ b/media/base/android/java/src/org/chromium/media/WebAudioMediaCodecBridge.java
@@ -4,13 +4,11 @@
 
 package org.chromium.media;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.media.MediaCodec;
 import android.media.MediaCodec.BufferInfo;
 import android.media.MediaExtractor;
 import android.media.MediaFormat;
-import android.os.Build;
 import android.os.ParcelFileDescriptor;
 import android.util.Log;
 
@@ -21,7 +19,6 @@ import java.io.File;
 import java.nio.ByteBuffer;
 
 @JNINamespace("media")
-@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
 class WebAudioMediaCodecBridge {
     static final String LOG_TAG = "WebAudioMediaCodec";
     // TODO(rtoy): What is the correct timeout value for reading
@@ -36,13 +33,10 @@ class WebAudioMediaCodecBridge {
 
     @SuppressWarnings("deprecation")
     @CalledByNative
-    private static boolean decodeAudioFile(Context ctx,
-                                           long nativeMediaCodecBridge,
-                                           int inputFD,
-                                           long dataSize) {
+    private static boolean decodeAudioFile(Context ctx, long nativeMediaCodecBridge,
+            int inputFD, long dataSize) {
 
-        if (dataSize < 0 || dataSize > 0x7fffffff)
-            return false;
+        if (dataSize < 0 || dataSize > 0x7fffffff) return false;
 
         MediaExtractor extractor = new MediaExtractor();