ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 4931ae54: Merge "Minor "adb help" fixes."

Browse source 
* commit '4931ae545a59b595af718bf16e2280f69b62ca2f':
  Minor "adb help" fixes.
This commit is contained in:
Elliott Hughes 2015-06-12 21:57:51 +00:00 • committed by Android Git Automerger
commit dc5993b3ba
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
adb/commandline.cpp
View file

@ -110,7 +110,6 @@ static void help() {
" ('-a' means copy timestamp and mode)\n" " ('-a' means copy timestamp and mode)\n"
" adb sync [ <directory> ] - copy host->device only if changed\n" " adb sync [ <directory> ] - copy host->device only if changed\n"
" (-l means list but don't copy)\n" " (-l means list but don't copy)\n"
" (see 'adb help all')\n"
" adb shell - run remote shell interactively\n" " adb shell - run remote shell interactively\n"
" adb shell <command> - run remote shell command\n" " adb shell <command> - run remote shell command\n"
" adb emu <command> - run emulator console command\n" " adb emu <command> - run emulator console command\n"
@ -202,11 +201,12 @@ static void help() {
" adb reboot sideload - reboots the device into the sideload mode in recovery program (adb root required).\n" " adb reboot sideload - reboots the device into the sideload mode in recovery program (adb root required).\n"
" adb reboot sideload-auto-reboot\n" " adb reboot sideload-auto-reboot\n"
" - reboots into the sideload mode, then reboots automatically after the sideload regardless of the result.\n" " - reboots into the sideload mode, then reboots automatically after the sideload regardless of the result.\n"
" adb reboot-bootloader - reboots the device into the bootloader\n" " adb sideload <file> - sideloads the given package\n"
" adb root - restarts the adbd daemon with root permissions\n" " adb root - restarts the adbd daemon with root permissions\n"
" adb unroot - restarts the adbd daemon without root permissions\n" " adb unroot - restarts the adbd daemon without root permissions\n"
" adb usb - restarts the adbd daemon listening on USB\n" " adb usb - restarts the adbd daemon listening on USB\n"
" adb tcpip <port> - restarts the adbd daemon listening on TCP on the specified port\n" " adb tcpip <port> - restarts the adbd daemon listening on TCP on the specified port\n"
"\n"
"networking:\n" "networking:\n"
" adb ppp <tty> [parameters] - Run PPP over USB.\n" " adb ppp <tty> [parameters] - Run PPP over USB.\n"
" Note: you should not automatically start a PPP connection.\n" " Note: you should not automatically start a PPP connection.\n"
@ -221,7 +221,7 @@ static void help() {
" - If it is \"system\", \"vendor\", \"oem\" or \"data\", only the corresponding partition\n" " - If it is \"system\", \"vendor\", \"oem\" or \"data\", only the corresponding partition\n"
" is updated.\n" " is updated.\n"
"\n" "\n"
"environmental variables:\n" "environment variables:\n"
" ADB_TRACE - Print debug information. A comma separated list of the following values\n" " ADB_TRACE - Print debug information. A comma separated list of the following values\n"
" 1 or all, adb, sockets, packets, rwx, usb, sync, sysdeps, transport, jdwp\n" " 1 or all, adb, sockets, packets, rwx, usb, sync, sysdeps, transport, jdwp\n"
" ANDROID_SERIAL - The serial number to connect to. -s takes priority over this if given.\n" " ANDROID_SERIAL - The serial number to connect to. -s takes priority over this if given.\n"