am d94ed379: Merge change I1dc2ae28 into eclair
Merge commit 'd94ed3794c68b93ac9faa357bb3517f4fae88162' into eclair-mr2
* commit 'd94ed3794c68b93ac9faa357bb3517f4fae88162':
Fix bug 2242585 to unhide the new audio recording sources.
diff --git a/api/current.xml b/api/current.xml
index 3c94b4a..d82dc19 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -79701,6 +79701,17 @@
deprecated="not deprecated"
visibility="public"
>
+<field name="CAMCORDER"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="5"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
<field name="DEFAULT"
type="int"
transient="false"
@@ -79745,6 +79756,17 @@
visibility="public"
>
</field>
+<field name="VOICE_RECOGNITION"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="6"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
<field name="VOICE_UPLINK"
type="int"
transient="false"
diff --git a/media/java/android/media/MediaRecorder.java b/media/java/android/media/MediaRecorder.java
index 0b42cf6..4203cba 100644
--- a/media/java/android/media/MediaRecorder.java
+++ b/media/java/android/media/MediaRecorder.java
@@ -136,10 +136,10 @@
/** Voice call uplink + downlink audio source */
public static final int VOICE_CALL = 4;
- /** @hide Microphone audio source with same orientation as camera */
+ /** Microphone audio source with same orientation as camera */
public static final int CAMCORDER = 5;
- /** @hide Microphone audio source tuned for voice recognition */
+ /** Microphone audio source tuned for voice recognition */
public static final int VOICE_RECOGNITION = 6;
}