commit 246f4529bb06c454759cf63d64cef3419f8df64a
author Jean-Michel Trivi <jmtrivi@google.com> Fri Dec 28 08:46:49 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 28 08:46:50 2012 -0800
tree 8b7cd6e605252da42010e392c203d28a33565a0d
parent d05e4d820d72474fbdb20998dce1a697c2f120bc
parent 58a9cad4e88d3cf693b917b58677c392cdec24fc

Merge "Remove unused audio source"

media/java/android/media/MediaRecorder.java

diff --git a/media/java/android/media/MediaRecorder.java b/media/java/android/media/MediaRecorder.java
index 48bea52..e0430b4 100644
--- a/media/java/android/media/MediaRecorder.java
+++ b/media/java/android/media/MediaRecorder.java
@@ -177,12 +177,6 @@
          *  is applied.
          */
         public static final int VOICE_COMMUNICATION = 7;
-
-        /**
-         * @hide
-         * Audio source for remote submix.
-         */
-        public static final int REMOTE_SUBMIX_SOURCE = 8;
     }
 
     /**
@@ -298,10 +292,7 @@
      * @see android.media.MediaRecorder.AudioSource
      */
     public static final int getAudioSourceMax() {
-        // FIXME disable selection of the remote submxi source selection once test code
-        //       doesn't rely on it
-        return AudioSource.REMOTE_SUBMIX_SOURCE;
-        //return AudioSource.VOICE_COMMUNICATION;
+        return AudioSource.VOICE_COMMUNICATION;
     }
 
     /**