summaryrefslogtreecommitdiffstats
path: root/adb
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | adb: Prevent registering usb_disconnect twiceBenoit Goby2013-04-011-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adbd can receive multiple AUTH_RSAPUBLICKEY packets. This happens for example when booting with usb attached when we retry authenticating after the framework is done booting. Make sure usb_disconnect is only registered once, otherwise this creates a loop in the disconnects list. Bug: 8504991 Change-Id: Ia1f9a37005dd17b7eefee1493d622e1679263eea
* | | | | | | | am b1d20464: am f5562cb6: Merge "adb: Remove execute permission on usb_vendor.c"Colin Cross2013-03-291-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b1d204648eb8061aa59bed189ce41938fa40197a': adb: Remove execute permission on usb_vendor.c
| * | | | | | | am f5562cb6: Merge "adb: Remove execute permission on usb_vendor.c"Colin Cross2013-03-291-0/+0
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit 'f5562cb66c1c15d65bc372ede4c180430e1ce9d7': adb: Remove execute permission on usb_vendor.c
| | * | | | | | adb: Remove execute permission on usb_vendor.cBenoit Goby2013-03-291-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia4f2e0171634764bde3593593b3c99184236528f
* | | | | | | | am 78420edc: resolved conflicts for merge of 35200422 to jb-mr2-dev-plus-aospBenoit Goby2013-03-291-0/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '78420edc0f3e99684c36f0d516744b4d9312a1c1': Add BYD's USB Vendor ID Add USB Vendor ID for Xiaomi Add vendor IDs to adb
| * | | | | | | resolved conflicts for merge of 35200422 to jb-mr2-dev-plus-aospBenoit Goby2013-03-291-0/+6
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | / / / / / | | |/ / / / / | |/| | | | | Change-Id: I754b8b17a7e3a6e4ef3ccf0a02beca0fc72ba749
| | * | | | | Add BYD's USB Vendor IDsunxiaoqi2013-03-291-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0694ed72d70638f0a4a252b1c802ae8f4e33385e
| | * | | | | Add USB Vendor ID for XiaomiGary Hua2013-03-291-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9f0622e05334a5074604bd88093172654b4c3e7d Signed-off-by: Gary Hua <huachengping@xiaomi.com>
| | * | | | | Add vendor IDs to adbSam Lin2013-03-291-0/+9
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding vendor IDs to adb for device partners: AnyDATA, Harris & Oppo Change-Id: Ib8c5196c53599bd6eb077871cd95ccac935c42e7
* | | | | | toolbox: Make reboot a separate command from toolboxBenoit Goby2013-03-261-1/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the CAP_SYS_BOOT filesystem capability on the new reboot command and keep CAP_SYS_BOOT in adb bounding set so that the shell user can run it. Change-Id: I1dd6143445ee2a952254f0452ab6e544318431dd
* | | | | Add vendor IDs to adbSam Lin2013-03-121-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding vendor IDs to adb for device partners: AnyDATA, Harris & Oppo Change-Id: Ib8c5196c53599bd6eb077871cd95ccac935c42e7
* | | | | am 822ea9b3: am fd5c6b9f: Merge "Close adb_usb.ini after reading it"Elliott Hughes2013-03-081-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '822ea9b3d1cf240b16135e1b5c3bd926c02d17d6': Close adb_usb.ini after reading it
| * | | | Merge "Close adb_usb.ini after reading it"Elliott Hughes2013-03-091-0/+1
| |\ \ \ \
| | * | | | Close adb_usb.ini after reading itChris Dearman2012-11-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Chris Dearman <chris@mips.com> Change-Id: I7d3ee8cbd54af206dac89225c438e6c7322c571f
* | | | | | DO NOT MERGE - Document new -obb flag for adb backupChristopher Tate2013-03-081-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that adb backup handles OBB file backup/restore. (Cherrypicked) Change-Id: Ie92b546e3898b62d74f552ab577b7756ad176ee6
* | | | | | am 79d4381a: am 69f3ec84: Merge "Fix issues where the filename is referred ↵Colin Cross2013-03-051-4/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to as \'sideload\'" * commit '79d4381a8e838d7ddbeda5b7dc90e0c5bca5a8c6': Fix issues where the filename is referred to as 'sideload'
| * | | | | Fix issues where the filename is referred to as 'sideload'Magnus Eriksson2013-03-051-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The adb sideload utility referes to the filename as 'sideload' in some places. This patch changes the printouts to display the filename instead. Change-Id: I38ada01a08bed53a8d9697c03f55ce8cee2abe12 Signed-off-by: Magnus Eriksson <eriksson.mag@gmail.com>
* | | | | | am 844306bd: am cc4499b6: Merge "adb: use correct header file."Nick Kralevich2013-02-281-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '844306bd9cb3c8b3e514e5d91e9514556e8f95f4': adb: use correct header file.
| * | | | | adb: use correct header file.Nick Kralevich2013-02-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7a66ced762dc077247fd7c2714ae8850ffdcaeb9
* | | | | | Remove CAP_NET_RAW from adbNick Kralevich2013-02-271-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ping no longer needs CAP_NET_RAW. See: * http://lwn.net/Articles/443051/ * https://android-review.googlesource.com/52090 * https://android-review.googlesource.com/52072 Eliminate the CAP_NET_RAW special case in adb Change-Id: If9d32c5254291b123b06bededc94b64113f6b8f2
* | | | | | Merge "adb: Fix secure adb when booting with usb attached"Benoit Goby2013-02-213-5/+29
|\ \ \ \ \ \
| * | | | | | adb: Fix secure adb when booting with usb attachedBenoit Goby2013-02-023-5/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When booting with usb attached, the secure adb authentication happens long before the framework is done booting, so adb can't notify the framework to install the public key. Change-Id: Id2af6cebece345022f56cb0c4b5af24e1d7a425c
* | | | | | | adb: drop capability bounding set on user buildsNick Kralevich2013-02-151-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | run-as: don't require CAP_DAC_OVERRIDE. Prevent an adb spawned application from acquiring capabilities other than * CAP_NET_RAW * CAP_SETUID * CAP_SETGID The only privileged programs accessible on user builds are * /system/bin/ping * /system/bin/run-as and the capabilities above are sufficient to cover those two programs. If the kernel doesn't support file capabilities, we ignore a prctl(PR_CAPBSET_DROP) failure. In a future CL, this could become a fatal error. Change-Id: I45a56712bfda35b5ad9378dde9e04ab062fe691a
* | | | | | | am e149855a: am 523a2090: Merge "adb: Use 64 bit capabilities."Nick Kralevich2013-02-151-5/+8
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | | | | | | * commit 'e149855a816c98149a95725139ae66f193049ddd': adb: Use 64 bit capabilities.
| * | | | | adb: Use 64 bit capabilities.Nick Kralevich2013-02-151-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the following kernel warning: $ adb shell dmesg | grep adb <6>[ 7.813003] warning: `adbd' uses 32-bit capabilities (legacy support in use) Change-Id: I3912302c5c577f1cb03f0c591834ab7b3a72ddf5
* | | | | | am 282caf3b: am 260f3471: am f8afaebe: Merge "Windows adb: include stdint.h ↵Kenny Root2013-01-291-0/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for uint8_t on MinGW-w64" # By Ray Donnelly # Via Android Git Automerger (2) and others * commit '282caf3bd0dfd81b92ac74e0b3ea970d195fee7b': Windows adb: include stdint.h for uint8_t on MinGW-w64
| * | | | | Merge "Windows adb: include stdint.h for uint8_t on MinGW-w64"Kenny Root2013-01-301-0/+1
| |\ \ \ \ \
| | * | | | | Windows adb: include stdint.h for uint8_t on MinGW-w64Ray Donnelly2013-01-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I84b8284bc034feb0acd313b0aad9e2fa5868854f
* | | | | | | am 6c3d3ccf: am d033739d: am d40fd86e: Merge "Windows adb: initialize on to ↵Kenny Root2013-01-291-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1 in disable_tcp_nagle" # By Ray Donnelly # Via Android Git Automerger (2) and others * commit '6c3d3ccfa5d1d77b80e5c7619909a48b976c69ec': Windows adb: initialize on to 1 in disable_tcp_nagle
| * | | | | | Merge "Windows adb: initialize on to 1 in disable_tcp_nagle"Kenny Root2013-01-301-1/+1
| |\ \ \ \ \ \
| | * | | | | | Windows adb: initialize on to 1 in disable_tcp_nagleRay Donnelly2013-01-111-1/+1
| | | | | | | |
* | | | | | | | Merge "adb: Add "unauthorized" connection state"Benoit Goby2013-01-293-0/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | adb: Add "unauthorized" connection stateBenoit Goby2013-01-153-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new connection state, so that devices, that require confirmation to allow adb, appear as "unauthorized" in the adb devices lists. Change-Id: Ib4264bc5736dedecf05bcf8e31896f4d7a91fad8
* | | | | | | | | Merge "adb: Read secure adb keys on every auth request"Benoit Goby2013-01-282-14/+11
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | adb: Read secure adb keys on every auth requestBenoit Goby2013-01-152-14/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The framework can now clear the user key list, so we need to reload the key list on every auth request instead of loading it once when adbd starts. This also fixes issues with encrypted devices, where the user key file is only readable after the user has unlocked the device. Change-Id: I350c5aab986f8ca86b95f316398d03012553e581
* | | | | | | | | am 3dbcb6d6: am 98d07897: Merge "Windows adb: Make client stdout and stderr ↵David Turner2013-01-211-0/+21
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | handles uninheritable" * commit '3dbcb6d6c6befc406e4ce4e2b7aa9ad2635dfbb8': Windows adb: Make client stdout and stderr handles uninheritable
| * | | | | | | Merge "Windows adb: Make client stdout and stderr handles uninheritable"David Turner2013-01-211-0/+21
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| / / / / / | | |/ / / / /
| | * | | | | Windows adb: Make client stdout and stderr handles uninheritableRay Donnelly2013-01-081-0/+21
| | |/ / / / | | | | | | | | | | | | | | | | | | Change-Id: Ib0519a199c9504aad1d0ecc3757f4d162984bf22
* | | | | | resolved conflicts for merge of f62f1e3a to masterYing Wang2013-01-101-2/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | Change-Id: I35c66859e2c454c20c8acc6b2b1f0833032205bb
| * | | | | Merge "Correct LOCAL_LDLIBS of adb"Ying Wang2013-01-081-2/+2
| |\ \ \ \ \
| | * | | | | Correct LOCAL_LDLIBS of adbChih-Wei Huang2013-01-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adb doesn't really use ncurses-libs, remove it. Add -ldl for the symbols dlclose, dlerror, dlopen... introduced from dso_dlfcn.c of libcrypto_static.a. Change-Id: If1cc23987a9b35ec535bbf8f4e7db141b9f10af7
* | | | | | | adb: HACK: (linux only) allow temp mitigation for multithreaded issuesJP Abgrall2013-01-092-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are serious multithreading issues between the fdevent and transport subsystems which both manipulate struct asocket and struct fde concurrently. The prevalent symptom being around multiple socket closures which stomp on each other, typically causing: "glibc detected *** adb: double free or corruption ..." This HACK allows forcing CPU affinity via an env var. E.g.: export ADB_CPU_AFFINITY_BUG6558362=0 which will cause ONLY the adb server and all its threads to be pegged to CPU 0. The result is visible in valgrind's helgrind: no *socket_close() related data races. But tons of other races are still there. Bug: 6558362 Change-Id: I0f112390a6a921c64b2a783297be9e99ce27fd56
* | | | | | | am 03873ce4: am 77eccafe: Merge "Support adb client connect to remote server"jp abgrall2013-01-044-7/+73
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '03873ce495e8c4bdb1289cdfa2b97cb47bb15108': Support adb client connect to remote server
| * | | | | | Support adb client connect to remote serverMatt Gumbel2013-01-044-7/+73
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ADB client: allow user to specify hostname and port number of remote adb server. ADB server: bind server to all network interfaces instead of just localhost when user gives -a flag. Primary use-case for this change is to support remote testing of USB devices. HostA is running some test automation software which invokes adb client. HostB has USB-only device attached and is running adb server. adb client on HostA makes connection to adb server on HostB to talk to the USB device. Change-Id: I845cc8c00350b400317f8c18f813e6fd79bd5470 Signed-off-by: Dean Kwon <daex.i.kwon@intel.com> Signed-off-by: Jim Bride <jim.bride@intel.com> Signed-off-by: Matt Gumbel <matthew.k.gumbel@intel.com>
* | | | | | am abf7cc97: am 13306d95: Merge "adb: Improve ADB\'s forward redirection ↵David 'Digit' Turner2012-12-133-33/+258
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | management." * commit 'abf7cc977e41540c45836d2fafd81606117f0399': adb: Improve ADB's forward redirection management.
| * | | | | adb: Improve ADB's forward redirection management.David 'Digit' Turner2012-11-263-33/+258
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a few new options/modes to 'adb forward': adb forward --list adb forward --remove <local> adb forward --remove-all adb forward --no-rebind <local> <remote> For more context, see http://code.google.com/p/android/issues/detail?id=39631 Note that this only affects the host adb client and server programs, i.e. it's compatible with devices running older adbd versions. Change-Id: I9cda3ba12b5a8560a2061620bc7f948e5c1e70f7
* | | | | am 493d04d2: am f621d62a: am c4244565: am d1e39491: Add usb vendor id for ↵Xavier Ducrohet2012-11-081-0/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Teleepoch. * commit '493d04d2fec59b273a067f5ef9d908dd0b441a08': Add usb vendor id for Teleepoch.
| * | | | am f621d62a: am c4244565: am d1e39491: Add usb vendor id for Teleepoch.Xavier Ducrohet2012-11-081-0/+4
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'f621d62adcbcd81d6479223d9afe47c1d966710d': Add usb vendor id for Teleepoch.
| | * | | Add usb vendor id for Teleepoch.Xavier Ducrohet2012-11-061-0/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: I82bbfed598fc3a886681c4139600cf487034c59c
| * | | | am 51ccef27: Merge "Add TEMP_FAILURE_RETRY macro for darwin"Kenny Root2012-10-131-0/+15
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '51ccef27cab58277775e62518a59666d2a059b62': Add TEMP_FAILURE_RETRY macro for darwin