Merge "Docs: Update memory requirement for missing 280dpi & 64-bit VGA class"
diff --git a/src/compatibility/5.0/android-5.0-cdd.html b/src/compatibility/5.0/android-5.0-cdd.html
index 27e19ea..6334c85 100644
--- a/src/compatibility/5.0/android-5.0-cdd.html
+++ b/src/compatibility/5.0/android-5.0-cdd.html
@@ -4851,8 +4851,7 @@
the port at bottom. Existing and new Android devices are <strong>very strongly encouraged to meet these requirements</strong> so they will be able to upgrade to future platform releases.
<li> It MUST allow a USB host connected with the Android device to access the
contents of the shared storage volume using either USB mass storage or Media
-Transfer Protocol, if the device reports the android.hardware.feature.output
-feature or the android.hardware.camera feature.
+Transfer.
<li> It SHOULD implement the Android Open Accessory (AOA) API and specification as
documented in the Android SDK documentation, and if it is an Android Handheld
device it MUST implement the AOA API. Device implementations implementing the
@@ -4993,12 +4992,12 @@
implementations MUST meet the following requirements: </p>
<ul>
- <li> <strong>Consistent frame latency</strong>—Inconsistent frame latency or a delay to render frames MUST NOT happen more
+ <li> <strong>Consistent frame latency</strong>Inconsistent frame latency or a delay to render frames MUST NOT happen more
often than 5 frames in a second, and SHOULD be below 1 frames in a second.
- <li> <strong>User interface latency</strong>—Device implementations MUST ensure low latency user experience by scrolling a
+ <li> <strong>User interface latency</strong>Device implementations MUST ensure low latency user experience by scrolling a
list of 10K list entries as defined by the Android Compatibility Test Suite
(CTS) in less than 36 secs.
- <li> <strong>Task switching</strong>—When multiple applications have been launched, re-launching an already-running
+ <li> <strong>Task switching</strong>When multiple applications have been launched, re-launching an already-running
application after it has been launched MUST take less than 1 second.
</ul>
@@ -5009,13 +5008,13 @@
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 5MB/s
for a 256MB file using 10MB write buffer.
- <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 0.5MB/s for a
256MB file using 4KB write buffer.
- <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 15MB/s for
a 256MB file using 10MB write buffer.
- <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 3.5MB/s for a
256MB file using 4KB write buffer.
</ul>
@@ -5900,7 +5899,7 @@
<p>9.9. Full-Disk Encryption</p>
</td>
<td>
-<p>Devices with a lock screen MUST support full-disk encryption. For new devices,
+<p>Devices with a lock screen SHOULD support full-disk encryption. For new devices,
full-disk encryption must be enabled out of box. </p>
</td>
</tr>
diff --git a/src/compatibility/downloads.jd b/src/compatibility/downloads.jd
index 04d1749..58babe8 100644
--- a/src/compatibility/downloads.jd
+++ b/src/compatibility/downloads.jd
@@ -51,22 +51,22 @@
<h2 id="android-50">Android 5.0</h2>
<p>Android 5.0 is the release of the development milestone code-named Lollipop.
The source code for the following tests can be synced with the
-'android-cts-5.0_r2' tag in the open source tree.</p>
+'android-cts-5.0_r3' tag in the open source tree.</p>
<ul>
<li><a href="5.0/android-5.0-cdd.pdf">Android 5.0 Compatibility Definition
Document (CDD)</a></li>
<li><a
-href="https://dl.google.com/dl/android/cts/android-cts-5.0_r2-linux_x86-arm.zip">Android
-5.0 R2 Compatibility Test Suite (CTS) - ARM</a></li>
+href="https://dl.google.com/dl/android/cts/android-cts-5.0_r3-linux_x86-arm.zip">Android
+5.0 R3 Compatibility Test Suite (CTS) - ARM</a></li>
<li><a
-href="https://dl.google.com/dl/android/cts/android-cts-5.0_r2-linux_x86-x86.zip">Android
-5.0 R2 Compatibility Test Suite (CTS) - x86</a></li>
+href="https://dl.google.com/dl/android/cts/android-cts-5.0_r3-linux_x86-x86.zip">Android
+5.0 R3 Compatibility Test Suite (CTS) - x86</a></li>
<li><a
-href="https://dl.google.com/dl/android/cts/android-cts-verifier-5.0_r2-linux_x86-arm.zip">Android
-5.0 R2 CTS Verifier - ARM</a></li>
+href="https://dl.google.com/dl/android/cts/android-cts-verifier-5.0_r3-linux_x86-arm.zip">Android
+5.0 R3 CTS Verifier - ARM</a></li>
<li><a
-href="https://dl.google.com/dl/android/cts/android-cts-verifier-5.0_r2-linux_x86-x86.zip">Android
-5.0 R2 CTS Verifier - x86</a></li>
+href="https://dl.google.com/dl/android/cts/android-cts-verifier-5.0_r3-linux_x86-x86.zip">Android
+5.0 R3 CTS Verifier - x86</a></li>
</ul>
<h2 id="android-44">Android 4.4</h2>