diff options
author | Glenn Kasten <gkasten@google.com> | 2015-03-09 17:01:26 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-09 17:01:26 +0000 |
commit | f507759eea9aaf5eb9aeaef9d93ab4914c1c5b25 (patch) | |
tree | 3764c79a2166e3d9921fff07888822c8f15485b1 /docs | |
parent | ca54b8765776cb1d1f5c2b87ca046ca64b9386ad (diff) | |
parent | e442d914b8a91b0893e59bca1aa75619ee59129d (diff) | |
download | frameworks_base-f507759eea9aaf5eb9aeaef9d93ab4914c1c5b25.zip frameworks_base-f507759eea9aaf5eb9aeaef9d93ab4914c1c5b25.tar.gz frameworks_base-f507759eea9aaf5eb9aeaef9d93ab4914c1c5b25.tar.bz2 |
am e442d914: am ad97ca81: am 4c0b2345: am 8f9ae232: am 36d008c5: am 5afdc97f: Fix USB typos
* commit 'e442d914b8a91b0893e59bca1aa75619ee59129d':
Fix USB typos
Diffstat (limited to 'docs')
-rw-r--r-- | docs/html/guide/topics/connectivity/usb/host.jd | 8 | ||||
-rw-r--r-- | docs/html/tools/adk/adk.jd | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/docs/html/guide/topics/connectivity/usb/host.jd b/docs/html/guide/topics/connectivity/usb/host.jd index 355dd2d..f957b60 100644 --- a/docs/html/guide/topics/connectivity/usb/host.jd +++ b/docs/html/guide/topics/connectivity/usb/host.jd @@ -31,7 +31,7 @@ page.title=USB Host <li><a href="{@docRoot}resources/samples/USB/AdbTest/index.html">AdbTest</a></li> <li><a href= - "{@docRoot}resources/samples/USB/MissileLauncher/index.html">MissleLauncher</a></li> + "{@docRoot}resources/samples/USB/MissileLauncher/index.html">MissileLauncher</a></li> </ol> </div> </div> @@ -283,7 +283,7 @@ while(deviceIterator.hasNext()){ <h3 id="permission-d">Obtaining permission to communicate with a device</h3> - <p>Before communicating with the USB device, your applicaton must have permission from your + <p>Before communicating with the USB device, your application must have permission from your users.</p> <p class="note"><strong>Note:</strong> If your application <a href="#using-intents">uses an @@ -388,7 +388,7 @@ mUsbManager.requestPermission(device, mPermissionIntent); should have more logic to correctly find the correct interface and endpoints to communicate on and also should do any transferring of data in a different thread than the main UI thread:</p> <pre> -private Byte[] bytes +private Byte[] bytes; private static int TIMEOUT = 0; private boolean forceClaim = true; @@ -409,7 +409,7 @@ connection.bulkTransfer(endpoint, bytes, bytes.length, TIMEOUT); //do in another <p>For more information, see the <a href= "{@docRoot}resources/samples/USB/AdbTest/index.html">AdbTest sample</a>, which shows how to do asynchronous bulk transfers, and the <a href= - "{@docRoot}resources/samples/USB/MissileLauncher/index.html">MissleLauncher sample</a>, which + "{@docRoot}resources/samples/USB/MissileLauncher/index.html">MissileLauncher sample</a>, which shows how to listen on an interrupt endpoint asynchronously.</p> <h3 id="terminating-d">Terminating communication with a device</h3> diff --git a/docs/html/tools/adk/adk.jd b/docs/html/tools/adk/adk.jd index 7e75c11..3f45c3c 100644 --- a/docs/html/tools/adk/adk.jd +++ b/docs/html/tools/adk/adk.jd @@ -331,7 +331,7 @@ href="http://arduino.cc/en/Main/ArduinoBoardADK">Arduino Mega ADK</a> (for EU na <li>Install the application to your device.</li> <li>Connect the ADK board (USB-A) to your Android-powered device (micro-USB). Ensure that the - power cable to the accessory is plugged in or that the micro-USB port on the accesory is + power cable to the accessory is plugged in or that the micro-USB port on the accessory is connected to your computer for power (this also allows you to <a href="#monitoring">monitor the ADK board</a>). When connected, accept the prompt that asks for whether or not to open the DemoKit application to connect to the accessory. If the prompt does not show up, connect and |