Merge "Prevent VPN being preloaded and activated without user's awareness" 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 9ffed99..45791f9 100644
--- a/src/compatibility/5.1/android-5.1-cdd.html
+++ b/src/compatibility/5.1/android-5.1-cdd.html
@@ -1475,16 +1475,24 @@
services [<a href="http://developer.android.com/reference/android/speech/tts/package-summary.html">Resources, 45</a>]. Device implementations reporting the feature android.hardware.audio.output
MUST meet these requirements related to the Android TTS framework. </p>
-<p>Device implementations:</p>
+<p>Android Automotive implementations:</p>
+<ul>
+<li>MUST support the Android TTS framework APIs.</li>
+<li>MAY support installation of third-party TTS engines. If supported, partners
+MUST provide a user-accessible interface that allows the user to select a TTS
+engine for use at system level.</li>
+</ul>
+
+<p>All other device implementations:</p>
<ul>
- <li>MUST support the Android TTS framework APIs and SHOULD include a TTS engine
+ <li> MUST support the Android TTS framework APIs and SHOULD include a TTS engine
supporting the languages available on the device. Note that the upstream
Android open source software includes a full-featured TTS engine
-implementation.</li>
- <li>MUST support installation of third-party TTS engines.</li>
- <li>MUST provide a user-accessible interface that allows users to select a TTS
-engine for use at the system level.</li>
+implementation.
+ <li> MUST support installation of third-party TTS engines
+ <li> MUST provide a user-accessible interface that allows users to select a TTS
+engine for use at the system level
</ul>
<h2 id="3_12_tv_input_framework">3.12. TV Input Framework</h2>
@@ -3637,9 +3645,18 @@
</tr>
<tr>
<td><ul>
- <li class="table_list">xhdpi or lower on small/normal screens</li>
- <li class="table_list">hdpi or lower on large screens</li>
- <li class="table_list">mdpi or lower on extra large screens</li></ul></td>
+ <li class="table_list">hdpi or lower on small/normal screens</li>
+ <li class="table_list">mdpi or lower on large screens</li>
+ <li class="table_list">ldpi or lower on extra large screens</li>
+ </ul></td>
+ <td>424MB</td>
+ <td>Not applicable</td>
+ </tr>
+ <tr>
+ <td><ul>
+ <li class="table_list">xhdpi or higher on small/normal screens</li>
+ <li class="table_list">hdpi or higher on large screens</li>
+ <li class="table_list">mdpi or higher on extra large screens</li></ul></td>
<td>512MB</td>
<td>832MB</td>
</tr>
@@ -3666,6 +3683,10 @@
dedicated to hardware components such as radio, video, and so on that is not
under the kernel’s control.</p>
+<p>Device implementations with less than 512MB of memory available to the kernel
+and userspace, unless an Android Watch, MUST return the value "true" for
+ActivityManager.isLowRamDevice().</p>
+
<p>Android Television devices MUST have at least 5GB and other device
implementations MUST have at least 1.5GB of non-volatile storage available for
application private data. That is, the /data partition MUST be at least 5GB for
@@ -4345,6 +4366,10 @@
<td>3.8.13 Unicode and font</td>
<td>MUST support Roboto 2 in addition to existing requirements.</td>
</tr>
+ <tr>
+ <td>3.11 Text-To-Speech</td>
+ <td>Added Android automotive requirements.</td>
+ </tr>
<tr>
<td>3.12. TV Input Framework</td>
<td>Android Television device implementations MUST support Television Input