Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am e442d914: am ad97ca81: am 4c0b2345: am 8f9ae232: am 36d008c5: am 5afdc97f: Fix USB typos

Browse Source 
* commit 'e442d914b8a91b0893e59bca1aa75619ee59129d':
  Fix USB typos
This commit is contained in:
Glenn Kasten
2015-03-09 17:01:26 +00:00
committed by Android Git Automerger
parent ca54b87657 e442d914b8
commit f507759eea
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docs/html/guide/topics/connectivity/usb/host.jd
View File

@@ -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/AdbTest/index.html">AdbTest</a></li>
<li><a href= <li><a href=
"{@docRoot}resources/samples/USB/MissileLauncher/index.html">MissleLauncher</a></li> "{@docRoot}resources/samples/USB/MissileLauncher/index.html">MissileLauncher</a></li>
</ol> </ol>
</div> </div>
</div> </div>
@@ -283,7 +283,7 @@ while(deviceIterator.hasNext()){
<h3 id="permission-d">Obtaining permission to communicate with a device</h3> <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> users.</p>
<p class="note"><strong>Note:</strong> If your application <a href="#using-intents">uses an <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 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> and also should do any transferring of data in a different thread than the main UI thread:</p>
<pre> <pre>
private Byte[] bytes private Byte[] bytes;
private static int TIMEOUT = 0; private static int TIMEOUT = 0;
private boolean forceClaim = true; 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= <p>For more information, see the <a href=
"{@docRoot}resources/samples/USB/AdbTest/index.html">AdbTest sample</a>, which shows how to do "{@docRoot}resources/samples/USB/AdbTest/index.html">AdbTest sample</a>, which shows how to do
asynchronous bulk transfers, and the <a href= 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> shows how to listen on an interrupt endpoint asynchronously.</p>
<h3 id="terminating-d">Terminating communication with a device</h3> <h3 id="terminating-d">Terminating communication with a device</h3>

2
docs/html/tools/adk/adk.jd
View File

@@ -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>Install the application to your device.</li>
<li>Connect the ADK board (USB-A) to your Android-powered device (micro-USB). Ensure that the <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 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 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 DemoKit application to connect to the accessory. If the prompt does not show up, connect and