diff options
| author | David Friedman <dmail@google.com> | 2015-08-20 01:39:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-20 01:39:38 +0000 |
| commit | 221e9062cb63acec11e1e1e4db648eae901bab11 (patch) | |
| tree | d22c81dfbb6750e57ae4a9062d83a9800a22ced1 | |
| parent | 31b1b2766d80a9a1979488e57a49d1015cfb5538 (diff) | |
| parent | c50ed7d8206a97582ba6b7cbb73a7f6d1ecdab0f (diff) | |
am c50ed7d8: am eea063d9: am 96a3c9a7: am 6540375a: am 311f8eee: am ed54f60a: Merge "Docs: Updating, clarifying Debug-over-WiFi instructions. Bug: 21371836" into mnc-preview-docs
* commit 'c50ed7d8206a97582ba6b7cbb73a7f6d1ecdab0f':
Docs: Updating, clarifying Debug-over-WiFi instructions. Bug: 21371836
| -rw-r--r-- | docs/html/tools/help/adb.jd | 56 |
1 files changed, 24 insertions, 32 deletions
diff --git a/docs/html/tools/help/adb.jd b/docs/html/tools/help/adb.jd index 641d463baca7..2faff4f3fe5c 100644 --- a/docs/html/tools/help/adb.jd +++ b/docs/html/tools/help/adb.jd @@ -420,62 +420,54 @@ Wi-Fi, as described here. <ol> <li> -Connect Android device and adb host computer +<p>Connect your Android device and adb host computer to a common Wi-Fi network accessible to both. We have found that not all access points are suitable; you may need to use an access point -whose firewall is configured properly to support adb. -</li> +whose firewall is configured properly to support adb.</p> -<li> -Connect the device with USB cable to host. +<p class="note"><strong>Note: </strong>If you are attempting to connect +to a Wear device, force it to connect to Wi-Fi by shutting off Bluetooth +on the phone connected to it.</p> </li> <li> -Make sure adb is running in USB mode on host. -<pre> -$ adb usb -restarting in USB mode -</pre> +Connect the device to the host computer with a USB cable. </li> <li> -Connect to the device over USB. -<pre> -$ adb devices -List of devices attached -######## device +Set the target device to listen for a TCP/IP connection on port 5555. +<pre class="no-pretty-print"> +$ adb tcpip 5555 </pre> </li> <li> -Restart host adb in tcpip mode. -<pre> -$ adb tcpip 5555 -restarting in TCP mode port: 5555 -</pre> +Disconnect the USB cable from the target device. </li> <li> -Find out the IP address of the Android device: -Settings -> About tablet -> Status -> IP address. -Remember the IP address, of the form <code>#.#.#.#</code>. +Find the IP address of the Android device. For example, on a Nexus device, you can find +the IP address at <strong>Settings</strong> > <strong>About tablet</strong> +(or <strong>About phone</strong>) > <strong>Status</strong> > <strong>IP address</strong>. Or, +on an Android Wear device, you can find the IP address at <strong>Settings</strong> > +<strong>Wi-Fi Settings</strong> > <strong>Advanced</strong> > <strong>IP address</strong>. </li> <li> -Connect adb host to device: -<pre> -$ adb connect #.#.#.# -connected to #.#.#.#:5555 +Connect to the device, identifying it by IP address. +<pre class="no-pretty-print"> +$ adb connect <device-ip-address> </pre> </li> + <li> -Remove USB cable from device, and confirm you can still access device: -<pre> +Confirm that your host computer is connected to the target device: +<pre class="no-pretty-print"> $ adb devices List of devices attached -#.#.#.#:5555 device +<device-ip-address>:5555 device </pre> </ol> @@ -500,10 +492,10 @@ Reconnect by executing the "adb connect" step again. <li> Or if that doesn't work, reset your adb host: -<pre> +<pre class="no-pretty-print"> adb kill-server </pre> and then start over from the beginning. </li> -</ol>
\ No newline at end of file +</ol> |