Merge "Docs: Clarify file I/O performance requirements" into lmp-mr1-dev
diff --git a/src/compatibility/5.1/android-5.1-cdd.html b/src/compatibility/5.1/android-5.1-cdd.html
index 620e660..0511973 100644
--- a/src/compatibility/5.1/android-5.1-cdd.html
+++ b/src/compatibility/5.1/android-5.1-cdd.html
@@ -1581,7 +1581,13 @@
<p>Device implementations MUST support the core media formats specified in the
Android SDK documentation [<a href="http://developer.android.com/guide/appendix/media-formats.html">Resources, 50</a>] except where explicitly permitted in this document. Specifically, device
implementations MUST support the media formats, encoders, decoders, file types,
-and container formats defined in the tables below. All of these codecs are
+and container formats defined in the tables below and reported via MediaCodecList
+[<a href="http://developer.android.com/reference/android/media/MediaCodecList.html">Resources,112</a>].
+Device implementations MUST also be able to decode all profiles reported in its CamcorderProfile
+[<a href="http://developer.android.com/reference/android/media/CamcorderProfile.html">Resources,
+113</a>].
+
+All of these codecs are
provided as software implementations in the preferred Android implementation
from the Android Open Source Project.</p>
@@ -2641,11 +2647,16 @@
<p>Android specifies a “compatibility mode” in which the framework operates in a
'normal' screen size equivalent (320dp width) mode for the benefit of legacy
applications not developed for old versions of Android that pre-date
-screen-size independence. Device implementations MUST include support for
-legacy application compatibility mode as implemented by the upstream Android
-open source code. That is, device implementations MUST NOT alter the triggers
-or thresholds at which compatibility mode is activated, and MUST NOT alter the
-behavior of the compatibility mode itself.</p>
+screen-size independence.</p>
+
+<ul>
+<li>Android Automotive does not support legacy compatibility mode.</li>
+<li>All other device implementations MUST include support for legacy application
+compatibility mode as implemented by the upstream Android open source code. That
+is, device implementations MUST NOT alter the triggers or thresholds at which
+compatibility mode is activated, and MUST NOT alter the behavior of the
+compatibility mode itself.</li>
+</ul>
<h3 id="7_1_6_screen_technology">7.1.6. Screen Technology</h3>
@@ -4508,6 +4519,10 @@
<td>Added that Android devices MAY support the Android extension pack. </td>
</tr>
<tr>
+ <td>7.1.5. Legacy Application Compatibility Mode</td>
+ <td>Added Android automotive requirements.</td>
+ </tr>
+ <tr>
<td>(old) 7.1.6. Screen Types</td>
<td>Section Removed </td>
</tr>
@@ -4921,6 +4936,10 @@
<p>111. Android Auto feature: <a href="http://developer.android.com/reference/android/content/res/Configuration.html#UI_MODE_TYPE_CAR">http://developer.android.com/reference/android/content/res/Configuration.html#UI_MODE_TYPE_CAR</a></p>
+<p>112. Android MediaCodecList API: <a href="http://developer.android.com/reference/android/media/MediaCodecList.html">http://developer.android.com/reference/android/media/MediaCodecList.html</a></p>
+
+<p>113. Android CamcorderProfile API: <a href="http://developer.android.com/reference/android/media/CamcorderProfile.html">http://developer.android.com/reference/android/media/CamcorderProfile.html</a></p>
+
<p>Many of these resources are derived directly or indirectly from the Android
SDK, and will be functionally identical to the information in that SDK’s
documentation. In any cases where this Compatibility Definition or the