Merge "Docs: Extract requirements from build setup"
diff --git a/src/compatibility/6.0/android-6.0-cdd.html b/src/compatibility/6.0/android-6.0-cdd.html
index 2b9f32e..9c124ef 100644
--- a/src/compatibility/6.0/android-6.0-cdd.html
+++ b/src/compatibility/6.0/android-6.0-cdd.html
@@ -2300,7 +2300,7 @@
<p>Device implementations MUST support dynamic video resolution and frame rate
switching through the standard Android APIs within the same stream for all VP8,
VP9, H.264, and H.265 codecs in real time and up to the maximum resolution
-supported on the device.</p>
+supported by each codec on the device.</p>
<p>Android device implementations with H.263 decoders, MUST support Baseline
Profile Level 30.</p>
@@ -2345,7 +2345,7 @@
<p class="table_footnote">1 REQUIRED for when the height as reported by the
-Display.getSupportedModes() method is not smaller than the video resolution.</p>
+Display.getSupportedModes() method is equal or greater than the video resolution.</p>
<p class="table_footnote">2 REQUIRED for Android Television device implementations.</p>
@@ -2384,7 +2384,7 @@
</table>
<p class="table_footnote">1 REQUIRED for when the height as reported by the
-Display.getSupportedModes() method is not smaller than the video resolution.</p>
+Display.getSupportedModes() method is equal or greater than the video resolution.</p>
<p class="table_footnote">2 REQUIRED for Android Television device implementations.</p>
@@ -2752,7 +2752,7 @@
<li>
If the device includes a 4 conductor 3.5mm audio jack,
the continuous round-trip audio latency MUST be 20 milliseconds or less over the audio jack path,
-and SHOULD be 10 milliseconds or less over at the audio jack path.
+and SHOULD be 10 milliseconds or less over the audio jack path.
</li>
<li>
@@ -4465,11 +4465,12 @@
permission.</p>
<p>Device implementations that include multiple shared storage paths (such as both
-an SD card slot and shared internal storage) MUST NOT allow Android
-applications to write to the secondary external storage, except for their
-package-specific directories on the secondary external storage, but SHOULD
-expose content from both storage paths transparently through Android’s media
-scanner service and android.provider.MediaStore.</p>
+an SD card slot and shared internal storage) MUST allow only pre-installed &
+privileged Android applications with the WRITE_EXTERNAL_STORAGE permission to
+write to the secondary external storage, except for their package-specific
+directories on the secondary external storage, but SHOULD expose content from
+both storage paths transparently through Android’s media scanner service
+and android.provider.MediaStore.</p>
<p>Regardless of the form of shared storage used, if the device implementation
has a USB port with USB peripheral mode support, it MUST provide some mechanism
@@ -4883,8 +4884,8 @@
list, read, or write to data owned by any other user. Note that removable
media, such as SD card slots, can allow one user to access another’s data by
means of a host PC. For this reason, device implementations that use removable
-media for the external storage APIs MUST encrypt the contents of the SD card if
-multiuser is enabled using a key stored only on non-removable media accessible
+media for the primary external storage APIs MUST encrypt the contents of the SD
+card if multiuser is enabled using a key stored only on non-removable media accessible
only to the system. As this will make the media unreadable by a host PC, device
implementations will be required to switch to MTP or a similar system to
provide host PCs with access to the current user’s data. Accordingly, device
diff --git a/src/compatibility/contact-us.jd b/src/compatibility/contact-us.jd
index e77b115..4ea6d3f 100644
--- a/src/compatibility/contact-us.jd
+++ b/src/compatibility/contact-us.jd
@@ -44,9 +44,9 @@
<h2 id="for-business-inquiries">For licensing Google Mobile Services</h2>
<p>Please send inquiries about licensing Google Mobile Services through the <a
-href="https://docs.google.com/a/google.com/forms/d/1qAHuR-MbmXeYuJ1aBd3neaUjNGxnnnCd2kzb0MEJpGQ/viewform"
-target="_blank">GMS Inquiry</a> form. Other non-GMS partnership inquiries can be sent to <a
+href="https://www.android.com/gms/contact/"
+target="_blank">GMS contact</a> form. Other non-GMS partnership inquiries can be sent to <a
href="mailto:android-partnerships@google.com">android-partnerships@google.com</a>
<p>While we read every message received, we cannot respond to each of them. We
-promise to contact you if we can help!</p>
\ No newline at end of file
+promise to contact you if we can help!</p>
diff --git a/src/devices/audio/images/ape_audio_tv_hdmi_tuner.png b/src/devices/audio/images/ape_audio_tv_hdmi_tuner.png
index 382bb45..3a5d832 100644
--- a/src/devices/audio/images/ape_audio_tv_hdmi_tuner.png
+++ b/src/devices/audio/images/ape_audio_tv_hdmi_tuner.png
Binary files differ
diff --git a/src/devices/audio/images/ape_audio_tv_tif.png b/src/devices/audio/images/ape_audio_tv_tif.png
index c8cd69e..cfdf97f 100644
--- a/src/devices/audio/images/ape_audio_tv_tif.png
+++ b/src/devices/audio/images/ape_audio_tv_tif.png
Binary files differ
diff --git a/src/devices/audio/images/ape_audio_tv_tuner.png b/src/devices/audio/images/ape_audio_tv_tuner.png
index bb062dc..96fb544 100644
--- a/src/devices/audio/images/ape_audio_tv_tuner.png
+++ b/src/devices/audio/images/ape_audio_tv_tuner.png
Binary files differ
diff --git a/src/devices/media/images/ape_fwk_media.png b/src/devices/media/images/ape_fwk_media.png
index 92a731b..b3ba6a7 100644
--- a/src/devices/media/images/ape_fwk_media.png
+++ b/src/devices/media/images/ape_fwk_media.png
Binary files differ
diff --git a/src/source/licenses.jd b/src/source/licenses.jd
index 0e4640d..fe34b47 100644
--- a/src/source/licenses.jd
+++ b/src/source/licenses.jd
@@ -40,7 +40,7 @@
<p>All <em>individual</em> contributors (that is, contributors making contributions
only on their own behalf) of ideas, code, or documentation to the Android Open
Source Project will be required to complete, sign, and submit an <a
-href="https://cla.developers.google.com/clas/new?kind=KIND_INDIVIDUAL&domain=DOMAIN_ANDROID">Individual
+href="https://cla.developers.google.com/about/google-individual">Individual
Contributor License Agreement</a>. The agreement can be executed online through the
<a href="https://android-review.googlesource.com/#/settings/agreements">code review tool</a>.
The agreement clearly defines the terms under which intellectual
@@ -50,7 +50,7 @@
other purpose.</p>
<p>For a <em>corporation</em> (or other entity) that has assigned employees to
work on the Android Open Source Project, a <a
-href="https://cla.developers.google.com/clas/new?kind=KIND_CORPORATE&domain=DOMAIN_ANDROID">Corporate
+href="https://cla.developers.google.com/about/google-corporate">Corporate
Contributor License Agreement</a> is available.
This version of the agreement allows a
corporation to authorize contributions submitted by its designated employees
