Merge "Docs: Clarify the definition of 'verified boot'" 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 410597d..ef2cd35 100644
--- a/src/compatibility/5.1/android-5.1-cdd.html
+++ b/src/compatibility/5.1/android-5.1-cdd.html
@@ -1284,8 +1284,13 @@
hardware, the corresponding APIs MUST be implemented as no-ops. This behavior
is further detailed in <a href="#7_hardware_compatibility">section 7</a>.</p>
-<p>Additionally, the implementation MUST correctly render all resources (icons,
-sound files, etc.) provided for in the APIs [<a href="https://developer.android.com/guide/topics/resources/available-resources.html">Resources, 23</a>], or in the Status/System Bar icon style guide [<a href="http://developer.android.com/design/style/iconography.html">Resources, 24</a>]. Device implementers MAY provide an alternative user experience for
+<p>Additionally, the implementation MUST correctly render all resources (icons, animation files
+etc.) provided for in the APIs
+[<a href="https://developer.android.com/guide/topics/resources/available-resources.html">Resources, 23</a>],
+or in the Status/System Bar icon style guide
+[<a href="http://developer.android.com/design/style/iconography.html">Resources, 24</a>],
+which in the case of an Android Television device includes the possibility to not display the
+notifications. Device implementers MAY provide an alternative user experience for
notifications than that provided by the reference Android Open Source
implementation; however, such alternative notification systems MUST support
existing notification resources, as above. </p>
@@ -1298,8 +1303,10 @@
<li><strong>Lockscreen notifications</strong>. Notifications shown over a lock screen with granular control on visibility.</li>
</ul>
-<p>Device implementations MUST properly display and execute these notifications,
-including the title/name, icon, text as documented in the Android APIs <a href="http://developer.android.com/design/patterns/notifications.html">[Resources, 25]</a>.</p>
+<p>Android device implementations, when such notifications are made visible, MUST properly execute
+Rich and Heads-up notifications and include the title/name, icon, text as documented in the Android
+APIs <a href="https://developer.android.com/design/patterns/notifications.html">[Resources, 25]</a>.
+</p>
<p>Android includes Notification Listener Service APIs that allow apps (once
explicitly enabled by the user) to receive a copy of all notifications as they
@@ -1434,8 +1441,10 @@
<p>The Remote Control Client API is deprecated from Android 5.0 in favor of the
Media Notification Template that allows media applications to integrate with
-playback controls that are displayed on the lock screen [<a href="http://developer.android.com/reference/android/app/Notification.MediaStyle.html">Resources, 35</a>]. Device implementations that support a lock screen in the device MUST support
-the Media Notification Template along with other notifications.</p>
+playback controls that are displayed on the lock screen [<a href="http://developer.android.com/reference/android/app/Notification.MediaStyle.html">Resources, 35</a>].
+Device implementations that support a lock screen, unless an Android Automotive or Watch
+implementation, MUST display the Lockscreen Notifications including the Media Notification
+Template.</p>
<h3 id="3_8_11_dreams">3.8.11. Dreams</h3>
@@ -1581,7 +1590,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>
@@ -3989,17 +4004,17 @@
<h2 id="8_2_file_i_o_access_performance">8.2. File I/O Access Performance</h2>
-<p>Device implementations MUST ensure file access performance consistency for read
+<p>Device implementations MUST ensure internal storage file access performance consistency for read
and write operations. </p>
<ul>
- <li><strong>Sequential write</strong>. Device implementations MUST ensure a sequential write performance of 10MB/s
+ <li><strong>Sequential write</strong>. Device implementations MUST ensure a sequential write performance of at least 5MB/s
for a 256MB file using 10MB write buffer.</li>
- <li><strong>Random write</strong>. Device implementations MUST ensure a random write performance of 0.5MB/s for a
+ <li><strong>Random write</strong>. Device implementations MUST ensure a random write performance of at least 0.5MB/s for a
256MB file using 4KB write buffer.</li>
- <li><strong>Sequential read</strong>. Device implementations MUST ensure a sequential read performance of 15MB/s for
+ <li><strong>Sequential read</strong>. Device implementations MUST ensure a sequential read performance of at least 15MB/s for
a 256MB file using 10MB write buffer.</li>
- <li><strong>Random read</strong>. Device implementations MUST ensure a random read performance of 3.5MB/s for a
+ <li><strong>Random read</strong>. Device implementations MUST ensure a random read performance of at least 3.5MB/s for a
256MB file using 4KB write buffer.</li>
</ul>
@@ -4421,7 +4436,8 @@
</tr>
<tr>
<td>3.8.3. Notifications</td>
- <td>Expanded definitions for types of supported notifications. </td>
+ <td>Expanded definitions for types of supported notifications. Added Android
+Watch and Automotive requirements.</td>
</tr>
<tr>
<td>3.8.4. Search</td>
@@ -4944,6 +4960,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