diff options
author | Scott Main <smain@google.com> | 2013-02-13 10:12:33 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-13 10:12:33 -0800 |
commit | ed0ea76cf4caf9b9e4528e776101739f4409a9a7 (patch) | |
tree | d6fb6b9ce91fe02cd9361338c71bb625e6a7ce6b /docs | |
parent | bbe99b353db00c061085c12938d2a295c39a0e94 (diff) | |
parent | 1214e975d65dc5604ac95ed3ce7565333fa3e364 (diff) | |
download | frameworks_base-ed0ea76cf4caf9b9e4528e776101739f4409a9a7.zip frameworks_base-ed0ea76cf4caf9b9e4528e776101739f4409a9a7.tar.gz frameworks_base-ed0ea76cf4caf9b9e4528e776101739f4409a9a7.tar.bz2 |
am 1214e975: am 3baf1b6f: am 60d8836e: am be4d1dcd: am dd8b5845: Merge "docs: add info about secure adb" into jb-mr1-dev
# Via Android Git Automerger (4) and others
* commit '1214e975d65dc5604ac95ed3ce7565333fa3e364':
docs: add info about secure adb
Diffstat (limited to 'docs')
-rw-r--r-- | docs/html/tools/device.jd | 12 | ||||
-rw-r--r-- | docs/html/tools/help/adb.jd | 32 |
2 files changed, 38 insertions, 6 deletions
diff --git a/docs/html/tools/device.jd b/docs/html/tools/device.jd index 61cd08a..cf7b63f 100644 --- a/docs/html/tools/device.jd +++ b/docs/html/tools/device.jd @@ -111,7 +111,17 @@ rules</a>.</p> </li> </ol> -<p>When plugged in over USB, can verify that your device is connected by executing <code>adb + +<p class="note"><strong>Note:</strong> When you connect a device running Android 4.2.2 or higher +to your computer, the system shows a dialog asking whether to accept an RSA key that allows +debugging through this computer. This security mechanism protects user devices because it ensures +that USB debugging and other adb commands cannot be executed unless you're able to unlock the +device and acknowledge the dialog. This requires that you have adb version 1.0.31 (available with +SDK Platform-tools r16.0.1 and higher) in order to debug on a device running Android 4.2.2 or +higher.</p> + + +<p>When plugged in over USB, you can verify that your device is connected by executing <code>adb devices</code> from your SDK {@code platform-tools/} directory. If connected, you'll see the device name listed as a "device."</p> diff --git a/docs/html/tools/help/adb.jd b/docs/html/tools/help/adb.jd index e0ee0e6..c8afca5 100644 --- a/docs/html/tools/help/adb.jd +++ b/docs/html/tools/help/adb.jd @@ -69,6 +69,13 @@ instances and handles commands from multiple adb clients, you can control any em instance from any client (or from a script).</p> +<p class="note"><strong>Note:</strong> When you connect a device running Android 4.2.2 or higher +to your computer, the system shows a dialog asking whether to accept an RSA key that allows +debugging through this computer. This security mechanism protects user devices because it ensures +that USB debugging and other adb commands cannot be executed unless you're able to unlock the +device and acknowledge the dialog. This requires that you have adb version 1.0.31 (available with +SDK Platform-tools r16.0.1 and higher) in order to debug on a device running Android 4.2.2 or +higher.</p> <h2 id="issuingcommands">Syntax</h2> @@ -871,8 +878,14 @@ list permission-groups <td><code> list permissions [options] <GROUP> </code></td> -<td>Prints all known permissions, optionally only
those in {@code <GROUP>}. <p>Options: -<ul>
<li>{@code -g}: Organize by group.
<li>{@code -f}: Print all information.
<li>{@code -s}: Short summary.
<li>{@code -d}: Only list dangerous permissions.
<li>{@code -u}: List only the permissions users will see. +<td>Prints all known permissions, optionally only + those in {@code <GROUP>}. <p>Options: +<ul> + <li>{@code -g}: Organize by group. + <li>{@code -f}: Print all information. + <li>{@code -s}: Short summary. + <li>{@code -d}: Only list dangerous permissions. + <li>{@code -u}: List only the permissions users will see. </ul> </td> </tr> @@ -882,7 +895,8 @@ list permissions [options] <GROUP> list instrumentation </code></td> <td>List all test packages. <p>Options: - <ul>
<li>{@code -f}: List the APK file for the test package. + <ul> + <li>{@code -f}: List the APK file for the test package. <li>{@code <TARGET_PACKAGE>}: List test packages for only this app. </ul> </td> @@ -925,7 +939,14 @@ path <PACKAGE> install [options] <PATH> </code></td> <td>Installs a package (specified by {@code <PATH>}) to the system. <p>Options: - <ul>
<li>{@code -l}: Install the package with forward lock.
<li>{@code -r}: Reinstall an exisiting app, keeping its data.
<li>{@code -t}: Allow test APKs to be installed.
<li>{@code -i <INSTALLER_PACKAGE_NAME>}: Specify the installer package name.
<li>{@code -s}: Install package on the shared mass storage (such as sdcard).
<li>{@code -f}: Install package on the internal system memory.
<li>{@code -d}: Allow version code downgrade. + <ul> + <li>{@code -l}: Install the package with forward lock. + <li>{@code -r}: Reinstall an exisiting app, keeping its data. + <li>{@code -t}: Allow test APKs to be installed. + <li>{@code -i <INSTALLER_PACKAGE_NAME>}: Specify the installer package name. + <li>{@code -s}: Install package on the shared mass storage (such as sdcard). + <li>{@code -f}: Install package on the internal system memory. + <li>{@code -d}: Allow version code downgrade. </ul> </td> </tr> @@ -935,7 +956,8 @@ install [options] <PATH> uninstall [options] <PACKAGE> </code></td> <td>Removes a package from the system. <p>Options: - <ul>
<li>{@code -k}: Keep the data and cache directories around after package removal. + <ul> + <li>{@code -k}: Keep the data and cache directories around after package removal. </ul> </td> </tr> |