Merge "Update feature list for audio and MIDI" into mnc-docs
diff --git a/docs/html/guide/topics/manifest/uses-feature-element.jd b/docs/html/guide/topics/manifest/uses-feature-element.jd
index 1ab1041..5472453 100755
--- a/docs/html/guide/topics/manifest/uses-feature-element.jd
+++ b/docs/html/guide/topics/manifest/uses-feature-element.jd
@@ -553,12 +553,27 @@
<th>Comments</th>
</tr>
<tr>
- <td>Audio</td>
- <td><code>android.hardware.audio.low_latency</td>
+ <td rowspan="4">Audio</td>
+ <td><code>android.hardware.audio.low_latency</code></td>
<td>The application uses a low-latency audio pipeline on the device and
-is sensitive to delays or lag in sound input or output.</td>
-<td>
-</td>
+ is sensitive to delays or lag in sound input or output.</td>
+ <td></td>
+ </tr>
+ <tr>
+ <td><code>android.hardware.audio.pro</code></td>
+ <td>The application uses high-end audio functionality and performance.</td>
+ <td></td>
+ </tr>
+ <tr>
+ <td><code>android.hardware.microphone</code></td>
+ <td>The application records audio via a microphone.</td>
+ <td></td>
+ </tr>
+ </tr>
+ <td><code>android.hardware.output</code></td>
+ <td>The application produces at least one form of audio output, such as speakers, audio jack
+ or streaming over bluetooth.</td>
+ <td></td>
</tr>
<tr>
<td rowspan="2">Bluetooth</td>
@@ -944,6 +959,12 @@
support Live Wallpapers.</td>
</tr>
<tr>
+ <td>MIDI</td>
+ <td><code>android.software.midi</code></td>
+ <td>The application connects to musical instruments or outputs sound
+ using the Musical Instrument Digital Interface (MIDI) protocol.</td>
+</tr>
+<tr>
<td rowspan="2">SIP/VOIP</td>
<td><code>android.software.sip</code></td>
<td>The application uses SIP service on the device and should be installed only on devices that