Merge "Docs: Changes to source.android.com" am: d5b5f2bbbf am: 4a739548d8

am: 8fdff5fcad

Change-Id: I324808b42c9390ab58de069dbe34fa3b6eabb3e1

12 files changed, 53 insertions, 35 deletions

diff --git a/en/compatibility/cts/rotation-vector.html b/en/compatibility/cts/rotation-vector.html
index 5773deed..9abff4eb 100644
--- a/en/compatibility/cts/rotation-vector.html
+++ b/en/compatibility/cts/rotation-vector.html
@@ -40,9 +40,8 @@ additional details.</p>
 
 <ol>
   <li>Install OpenCV Manager on the Android device being tested.
-  <li>Download the OpenCV SDK from <a
-href="http://opencv.org/downloads.html">OpenCV.org</a>. Select
-<strong>OpenCV for Android</strong> with version 3.0.0.
+  <li>Download the <code>OpenCV-3.0.0-android-sdk.zip</code> package from <a
+href="https://sourceforge.net/projects/opencvlibrary/files/opencv-android/3.0.0">SourceForge.net</a>.
   <li>Find the APK
 from the <code>apk</code> folder inside the downloaded archive. Consult <a
 href="http://developer.android.com/tools/help/adb.html#move">installing an
diff --git a/en/devices/accessories/headset/expected-behavior.html b/en/devices/accessories/headset/expected-behavior.html
index 3d7c3d66..a49644f0 100644
--- a/en/devices/accessories/headset/expected-behavior.html
+++ b/en/devices/accessories/headset/expected-behavior.html
@@ -129,12 +129,13 @@ press hangs up.</p>
 <img src="images/telephony_four.png" alt="Button functions for four-button headsets handling a phone call.">
 <p class="img-caption"><strong>Figure 8.</strong> Button functions for four-button headsets handling a phone call. </p>
 
-<h2 id=voice_assistance>Voice assistance</h2>
+<h2 id=voice_command>Voice commands</h2>
 
-<p>The voice assistance button is a new inline control standard for consistently
-and conveniently accessing a voice search feature from any approved wearable
+<p>The voice command button is a new inline control standard for consistently
+and conveniently accessing a voice command feature from any approved wearable
 audio device. By pressing the button defined here, users will hear the two-tone
-signature <a href="http://en.wikipedia.org/wiki/Earcon">earcon</a> indicating that the device is listening and ready to receive the query.</p>
+signature <a href="http://en.wikipedia.org/wiki/Earcon">earcon</a> indicating
+that the device is listening and ready to receive the query.</p>
 
 <p>Whether embedded into a multi-function button or highlighted as a single
 button, it should always be quickly accessible, ergonomically correct, and
@@ -143,7 +144,7 @@ placed intuitively as described in the following section.</p>
 <h2 id=buttons_and_function_mapping>Buttons and function mapping recommendations</h2>
 
 <p>The following diagrams depict the acceptable configuration of the Android voice
-assistance button.</p>
+command button.</p>
 
 <h3 id=options>Options</h3>
 
diff --git a/en/devices/accessories/headset/plug-headset-spec.html b/en/devices/accessories/headset/plug-headset-spec.html
index 324417dc..2a622a61 100644
--- a/en/devices/accessories/headset/plug-headset-spec.html
+++ b/en/devices/accessories/headset/plug-headset-spec.html
@@ -79,7 +79,7 @@ jack specification</a> and the
  <tr>
     <td>Function D</td>
     <td>Optional</td>
-    <td>Reserved (Nexus devices use this to launch Voice Assist)
+    <td>Reserved (Nexus devices use this to launch voice commands)
 </td>
  </tr>
 </table>
diff --git a/en/devices/accessories/headset/testing.html b/en/devices/accessories/headset/testing.html
index 6af19a1a..11eeedbc 100644
--- a/en/devices/accessories/headset/testing.html
+++ b/en/devices/accessories/headset/testing.html
@@ -86,7 +86,7 @@ the call is accepted.
 call is rejected.
 </ol>
 
-<h2 id=play_pause_for_voice_actions_microphone>Play/pause for voice actions + microphone</h2>
+<h2 id=play_pause_for_voice_commands_microphone>Play/pause for voice commands and microphone</h2>
 
 <ol>
   <li> Unlock the Android device and go to the home screen.
@@ -99,11 +99,11 @@ such as “What time is it?”
   </ol>
   </ol>
 
-<h2 id=voice_button_for_voice_actions_microphone>Voice button for voice actions + microphone</h2>
+<h2 id=voice_button_for_voice_commands_microphone>Voice command button for voice commands and microphone</h2>
 
 <ol>
   <li> Unlock the Android device and go to the home screen. 
-  <li> Short press the voice button.
+  <li> Short press the voice command button.
   <li> Verify:
   <ol>
     <li> you hear a beep after which you should be able to make a search query, such as
@@ -112,7 +112,7 @@ such as “What time is it?”
   </ol>
   </ol>
 
-<p class="note"><strong>Important</strong>: A press on the voice button can launch any search app, for example
+<p class="note"><strong>Important</strong>: A press on the voice command button can launch any search app, for example
 Google search.</p>
 
   </body>
diff --git a/en/devices/accessories/headset/usb-headset-spec.html b/en/devices/accessories/headset/usb-headset-spec.html
index 59b5039c..8d067c61 100644
--- a/en/devices/accessories/headset/usb-headset-spec.html
+++ b/en/devices/accessories/headset/usb-headset-spec.html
@@ -48,25 +48,25 @@ are encouraged to add features while keeping these requirements in mind.
    <th>Description</th>
   </tr>
   <tr>
-   <td>Function A</td>
+   <td>A</td>
    <td>Required</td>
-   <td>Play/pause (short press), launch voice assistance (long press), next (double
+   <td>Play/pause (short press), launch voice command (long press), next (double
        press)</td>
   </tr>
   <tr>
-   <td>Function B</td>
+   <td>B</td>
    <td>Optional</td>
    <td>Vol+</td>
   </tr>
   <tr>
-   <td>Function C</td>
+   <td>C</td>
    <td>Optional</td>
    <td>Vol-</td>
   </tr>
   <tr>
-   <td>Function D</td>
+   <td>D</td>
    <td>Optional</td>
-   <td>Launch voice assistance</td>
+   <td>Launch voice command</td>
   </tr>
 </table>
 <p>
@@ -105,7 +105,7 @@ mappings.
    <th>Behavior</th>
   </tr>
   <tr>
-   <td rowspan="6">Function A</td>
+   <td rowspan="6">A</td>
    <td rowspan="6"><strong>HID usage page</strong>: 0x0C<br>
        <strong>HID usage</strong>: 0x0CD<br>
        <strong>Kernel key</strong>: <code>KEY_PLAYPAUSE</code><br>
@@ -116,7 +116,7 @@ mappings.
   </tr>
   <tr>
    <td><strong>Input</strong>: Long press<br>
-       <strong>Output</strong>: Launch voice assistance<br>
+       <strong>Output</strong>: Launch voice command<br>
        <strong>Sends</strong>:
        <code>android.intent.action.VOICE_SEARCH_HANDS_FREE</code></td>
   </tr>
@@ -139,7 +139,7 @@ mappings.
        <strong>Output</strong>: Mute or unmute microphone</td>
   </tr>
   <tr>
-   <td>Function B</td>
+   <td>B</td>
    <td><strong>HID usage page</strong>: 0x0C<br>
        <strong>HID usage</strong>: 0x0E9<br>
        <strong>Kernel key</strong>: <code>KEY_VOLUMEUP</code><br>
@@ -149,7 +149,7 @@ mappings.
        <strong>Output</strong>: Increases the system or headset volume</td>
   </tr>
   <tr>
-   <td>Function C</td>
+   <td>C</td>
    <td><strong>HID usage page</strong>: 0x0C<br>
        <strong>HID usage</strong>: 0x0EA<br>
        <strong>Kernel key</strong>: <code>KEY_VOLUMEDOWN</code><br>
@@ -159,14 +159,14 @@ mappings.
        <strong>Output</strong>: Decreases the system or headset volume</td>
   </tr>
   <tr>
-   <td>Function D</td>
+   <td>D</td>
    <td><strong>HID usage page</strong>: 0x0C<br>
        <strong>HID usage</strong>: 0x0CF<br>
        <strong>Kernel key</strong>: <code>KEY_VOICECOMMAND</code><br>
        <strong>Android key</strong>: <code>KEYCODE_VOICE_ASSIST</code></td>
    <td>All. Can be triggered in any instance.</td>
    <td><strong>Input</strong>: Short or long press<br>
-       <strong>Output</strong>: Launch voice assistance</td>
+       <strong>Output</strong>: Launch voice command</td>
   </tr>
 </table>
 
diff --git a/en/devices/tech/admin/multi-user.html b/en/devices/tech/admin/multi-user.html
index 81daecb1..11a63df9 100644
--- a/en/devices/tech/admin/multi-user.html
+++ b/en/devices/tech/admin/multi-user.html
@@ -187,8 +187,8 @@ behavior in mind:</p>
 </ul>
 
 <p>For more details on Android 7.0 device administration features, refer to
-<a href="https://developer.android.com/preview/features/afw.html">Android
-for Work Updates</a>.</p>
+<a href="https://developer.android.com/about/versions/nougat/android-7.0.html#android_for_work">Android
+for Work</a>.</p>
 
   </body>
 </html>
diff --git a/en/devices/tech/debug/native-memory.html b/en/devices/tech/debug/native-memory.html
index d0ed2471..b690793d 100644
--- a/en/devices/tech/debug/native-memory.html
+++ b/en/devices/tech/debug/native-memory.html
@@ -31,6 +31,18 @@ href="https://android.googlesource.com/platform/bionic/+/master/libc/malloc_debu
 Memory Tracking using libc Callbacks</a> for a thorough description of the
 debugging options available for native memory issues.</p>
 
+<h2 id="malloc-stats">Malloc statistics</h2>
+
+<p>
+  Android supports the <a href="http://man7.org/linux/man-pages/man3/mallinfo.3.html"
+  ><code>mallinfo(3)</code></a>and <a href="http://man7.org/linux/man-pages/man3/malloc_info.3.html"
+  ><code>malloc_info(3)</code></a> extensions to <code>&lt;malloc.h&gt;</code></a>.
+  The <code>malloc_info</code> function is available in Android 6.0 and later and
+  its XML schema is documented in Bionic's
+  <a href="https://android.googlesource.com/platform/bionic/+/master/libc/include/malloc.h"
+  ><code>&lt;malloc.h&gt;</code></a>.
+</p>
+
 <h2 id="ddms">Dalvik Debug Monitor Server</h2>
 
 <p>You can also use the <a
diff --git a/en/devices/tech/test_infra/tradefed/full_example.html b/en/devices/tech/test_infra/tradefed/full_example.html
index 02768d86..c8f44f93 100644
--- a/en/devices/tech/test_infra/tradefed/full_example.html
+++ b/en/devices/tech/test_infra/tradefed/full_example.html
@@ -73,7 +73,7 @@ public class HelloWorldTest implements IRemoteTest {
 </code></pre>
 
 <p>Save this sample code to
-<code>&lt;tree&gt;/tools/tradefederation/prod-tests/src/com/android/tradefed/example/HelloWorldTest.java</code>
+<code>&lt;tree&gt;/tools/tradefederation/core/prod-tests/src/com/android/tradefed/example/HelloWorldTest.java</code>
 and rebuild tradefed from your shell:</p>
 <pre><code>m -jN</code></pre>
 
@@ -130,7 +130,7 @@ JARs themselves. Tradefed automatically recognizes all configurations placed in
 
 <p>To illustrate, move the <code>helloworld.xml</code> file into the tradefed
 core library
-(<code>&lt;tree&gt;/tools/tradefederation/prod-tests/res/config/example/helloworld.xml</code>).
+(<code>&lt;tree&gt;/tools/tradefederation/core/prod-tests/res/config/example/helloworld.xml</code>).
 Rebuild tradefed, restart the tradefed console, then ask tradefed to display the
 list of configurations from the classpath:</p>
 <pre><code>tf&gt; list configs
diff --git a/en/devices/tech/test_infra/tradefed/fundamentals/machine_setup.html b/en/devices/tech/test_infra/tradefed/fundamentals/machine_setup.html
index d07b34d7..71dcf5c9 100644
--- a/en/devices/tech/test_infra/tradefed/fundamentals/machine_setup.html
+++ b/en/devices/tech/test_infra/tradefed/fundamentals/machine_setup.html
@@ -36,7 +36,7 @@
 <pre>
 <code class="devsite-terminal">source ./build/make/envsetup.sh</code>
 <code class="devsite-terminal">lunch &lt;device-target&gt;</code>
-<code class="devsite-terminal">m -j8</code>
+<code class="devsite-terminal">make tradefed-all -j8</code>
 </pre>
 
 <h2>Run from the Command Line</h2>
diff --git a/en/security/bulletin/2017-04-01.html b/en/security/bulletin/2017-04-01.html
index ec0a93d9..4498d7dd 100644
--- a/en/security/bulletin/2017-04-01.html
+++ b/en/security/bulletin/2017-04-01.html
@@ -126,6 +126,10 @@ successfully exploited on Android.</p>
   href="https://twitter.com/jianqiangzhao">@jianqiangzhao</a>) and <a
   href="http://weibo.com/jfpan">pjf</a> of IceSword Lab, Qihoo 360: CVE-2017-6425,
   CVE-2016-5346</li>
+  <li>Lubo Zhang (<a href="mailto:zlbzlb815@163.com">zlbzlb815@163.com</a>) of
+  <a href="http://c0reteam.org">C0RE Team</a> and Yonggang Guo
+  (<a href="https://twitter.com/guoygang">@guoygang</a>) of IceSword Lab, Qihoo
+  360 Technology Co. Ltd.: CVE-2017-0564</li>
   <li><a href="mailto:salyzyn@android.com">Mark Salyzyn</a> of Google:
   CVE-2017-0558</li>
   <li>Mike Anderson (<a href="https://twitter.com/manderbot">@manderbot</a>) and
@@ -158,7 +162,7 @@ successfully exploited on Android.</p>
   Guang Gong (<a href="https://twitter.com/oldfresher">@oldfresher</a>), and Hao
   Chen of Alpha Team, Qihoo 360 Technology Co. Ltd.: CVE-2017-0580, CVE-2017-0577</li>
   <li>Yonggang Guo (<a href="https://twitter.com/guoygang">@guoygang</a>) of
-  IceSword Lab, Qihoo 360 Technology Co. Ltd.: CVE-2017-0586, CVE-2017-0564</li>
+  IceSword Lab, Qihoo 360 Technology Co. Ltd.: CVE-2017-0586</li>
   <li><a href="http://weibo.com/ele7enxxh">Zinuo Han</a> from Chengdu Security
   Response Center of Qihoo 360 Technology Co. Ltd.: CVE-2017-0548</li>
   <li>Zubin Mithra of Google: CVE-2017-0462</li>
diff --git a/en/source/build-numbers.html b/en/source/build-numbers.html
index d91e37d2..962244f0 100644
--- a/en/source/build-numbers.html
+++ b/en/source/build-numbers.html
@@ -197,6 +197,12 @@ site:</p>
   </thead>
   <tbody>
     <tr>
+      <td>NHG47K</td>
+      <td>android-7.1.2_r6</td>
+      <td>Nougat</td>
+      <td>Pixel XL, Pixel</td>
+    </tr>
+    <tr>
       <td>N2G47J</td>
       <td>android-7.1.2_r5</td>
       <td>Nougat</td>
diff --git a/en/source/site-updates.html b/en/source/site-updates.html
index 2b5360db..21bbe7f2 100644
--- a/en/source/site-updates.html
+++ b/en/source/site-updates.html
@@ -74,10 +74,6 @@ button at the top right of every page.</p>
 <em>Legal</em> footers, you can now find a complete list of links at the bottom
 of every page for building Android, connecting with the ecosystem, and getting
 help with the operating system's use.</p>
-<hr>
-<p>As always, we welcome your input, which you can send using the <strong>Send
-Feedback</strong> button near the top right of every page (except home). Find
-it below <strong>Go to Code</strong>.</p>
 
   </body>
 </html>