Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eafa368a authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Fix USB typos"

parents f7e503de 9e86f613

docs/html/guide/topics/connectivity/usb/host.jd

+4 −4
Original line number Diff line number Diff line
@@ -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>

docs/html/tools/adk/adk.jd

+1 −1
Original line number Diff line number Diff line
@@ -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