diff options
Diffstat (limited to 'docs/html/guide/topics')
4 files changed, 19 insertions, 9 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/guide/topics/manifest/application-element.jd b/docs/html/guide/topics/manifest/application-element.jd index 8a0e837..b5af9c3 100644 --- a/docs/html/guide/topics/manifest/application-element.jd +++ b/docs/html/guide/topics/manifest/application-element.jd @@ -449,9 +449,13 @@ href="{@docRoot}guide/topics/ui/actionbar.html">Action Bar</a> developer guide.< <dt><a name="vmSafeMode"></a>{@code android:vmSafeMode}</dt> <dd>Indicates whether the app would like the virtual machine (VM) to operate in safe mode. The default value is {@code "false"}. -</dd> +<p> This attribute was added in API level 8 where a value of "true" +disabled the Dalvik just-in-time (JIT) compiler. </p> +<p> This attribute was adapted in API level 22 where a value of "true" +disabled the ART ahead-of-time (AOT) compiler. </p> +</dd> </dl></dd> diff --git a/docs/html/guide/topics/manifest/data-element.jd b/docs/html/guide/topics/manifest/data-element.jd index ecba508..77f16dd 100644 --- a/docs/html/guide/topics/manifest/data-element.jd +++ b/docs/html/guide/topics/manifest/data-element.jd @@ -24,7 +24,7 @@ just a URI, or both a data type and a URI. A URI is specified by separate attributes for each of its parts: <p style="margin-left: 2em"> -{@code <scheme>://<host>:<port>/[<path>|<pathPrefix>|<pathPattern>]}</p> +{@code <scheme>://<host>:<port>[<path>|<pathPrefix>|<pathPattern>]}</p> <p> These attributes that specify the URL format are optional, but also mutually dependent: @@ -115,7 +115,8 @@ the filter.</dd> <dt><a name="path"></a>{@code android:path} <br/>{@code android:pathPrefix} <br/>{@code android:pathPattern}</dt> -<dd>The path part of a URI. The {@code path} attribute specifies a complete +<dd>The path part of a URI which must begin with a /. +The {@code path} attribute specifies a complete path that is matched against the complete path in an Intent object. The {@code pathPrefix} attribute specifies a partial path that is matched against only the initial part of the path in the Intent object. The {@code pathPattern} diff --git a/docs/html/guide/topics/manifest/uses-sdk-element.jd b/docs/html/guide/topics/manifest/uses-sdk-element.jd index e5e64e5..3ac87ef 100644 --- a/docs/html/guide/topics/manifest/uses-sdk-element.jd +++ b/docs/html/guide/topics/manifest/uses-sdk-element.jd @@ -227,11 +227,16 @@ Versions dashboards page</a>.</p> <table> <tr><th>Platform Version</th><th>API Level</th><th>VERSION_CODE</th><th>Notes</th></tr> + <tr><td><a href="{@docRoot}about/versions/android-5.1.html">Android 5.1</a></td> + <td><a href="{@docRoot}sdk/api_diff/22/changes.html" title="Diff Report">22</a></td> + <td>{@link android.os.Build.VERSION_CODES#LOLLIPOP_MR1}</td> + <td rowspan="2"><a href="{@docRoot}about/versions/lollipop.html">Platform +Highlights</a></td></tr> + <tr><td><a href="{@docRoot}about/versions/android-5.0.html">Android 5.0</a></td> <td><a href="{@docRoot}sdk/api_diff/21/changes.html" title="Diff Report">21</a></td> <td>{@link android.os.Build.VERSION_CODES#LOLLIPOP}</td> - <td><a href="{@docRoot}about/versions/lollipop.html">Platform -Highlights</a></td></tr> + </tr> <tr><td style="color:#bbb">Android 4.4W</td> <td><a href="{@docRoot}sdk/api_diff/20/changes.html" title="Diff Report">20</a></td> |