summaryrefslogtreecommitdiffstats
path: root/adb
Commit message (Collapse)AuthorAgeFilesLines
* am aeceb517: adb: Fix adb tcpip commandBenoit Goby2012-06-121-3/+3
|\ | | | | | | | | * commit 'aeceb5174502659cb4fff6de924b54ef7e6cdae7': adb: Fix adb tcpip command
| * adb: Fix adb tcpip commandBenoit Goby2012-06-121-3/+3
| | | | | | | | | | | | | | | | | | When running "adb tcpip 5555", adb create a service socket named "tcpip:5555". Only compare the 6 first chars "tcpip:" to decide if we enable exit_on_close. Bug: 6650130 Change-Id: I0835973de044f1cfde0e859ff0277c0ccc2630a3
* | resolved conflicts for merge of 246808be to jb-dev-plus-aospXavier Ducrohet2012-05-151-0/+3
|\ \ | |/ | | | | Change-Id: I3415e2d7b4e8295b7415951c0e8a78c775574089
| * Add USB Vendor ID for Yulong Coolpad.Xavier Ducrohet2012-05-141-0/+3
| | | | | | | | | | | | Bug: 6217375 Change-Id: I8931c42e8d3088cc4df8c6e56b323a7392cad5ef
* | am 9bdedb59: am a36e1aa3: Merge "adb: usb_windows: fix adb connection lost ↵Jean-Baptiste Queru2012-05-111-3/+3
|\ \ | | | | | | | | | | | | | | | | | | issue" * commit '9bdedb599874278abf206230ed31010eeb9b40dd': adb: usb_windows: fix adb connection lost issue
| * | adb: usb_windows: fix adb connection lost issueJack Ren2012-05-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows adb connection could be lost if the target side kernel enables the kmemleak. The root cause is that kmemleak downgrades USB performance, and lead to Windows adb host application timeout because usb_write()/usb_read()'s timeout time is very short. That issue is not reproducible in Linux host because its usb_write() timeout is 5s and usb_read() is blocked until return: usb_write() usb_read() Linux 5000ms blocked until return Windows 500+len*8 ms 500+len*8 ms To fix that issue, extend the Windows adb host usb_write timeout time to 5 seconds and usb_read() as a blocked routine: usb_write() usb_read() Windows 5000ms blocked until return Change-Id: If54e2b4c396a5a06318c0ee0b3326a00e7661fbc Signed-off-by: Yu Wang <yu.y.wang@intel.com> Signed-off-by: Jin Can Zhuang <jin.can.zhuang@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
* | | am 2ae9878c: am c5d5a5e8: Merge "Kindle Fire USB ID"Jean-Baptiste Queru2012-05-021-0/+3
|\ \ \ | |/ / | | / | |/ |/| * commit '2ae9878cd5dc517cc7338aaca81f0eb3127b4a53': Kindle Fire USB ID
| * Kindle Fire USB IDJon Sawyer2012-04-151-0/+3
| | | | | | | | | | | | | | Adds Lab126's USB id to the known USB Devices Change-Id: I3cd5d90bba68123d5d3d2d67e1ab7d60137eb388 Signed-off-by: Jon Sawyer <jon@cunninglogic.com>
* | Add encryption parameters to adb installAnonymous Coward2012-04-271-2/+14
| | | | | | | | Change-Id: I92e5f6ace1bc9e711c14cb83533aeb99ab9ab9f7
* | adb: set umask to 000Nick Kralevich2012-04-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | Init is going to be modified to set the umask to 077. This will impact adb, as "adb install" and "adb sync" assume that files will be world-readable / writable. Keep adb's umask at 000 for now. Bug: 3272072 Change-Id: I75978e8dd7bbdf4dbe7c9a691ef516235f207da2
* | adb: fix non-linux builds. tcpip:, root:, usb: are not for ADB_HOSTJP Abgrall2012-03-301-0/+2
| | | | | | | | | | | | | | The handling of adb root:/tpcip:/usb: is normally only for non-ADB_HOST. This avoids getuid() being invoked on windows builds. Change-Id: I365b81d9f70de99b9347d3eac82e690a8ac5e747
* | adb: fix exit of "adb root" when it is a no-op.JP Abgrall2012-03-301-2/+3
| | | | | | | | | | | | | | | | | | "adb root" creates a socket, then starts the service. Socket creation should not set the exit_on_close when the service will be a no-op. Bug: 6259353 Change-Id: Ie526d2fad64f39a48051ed0ff6fb3405c2802ced
* | Merge "Revert "add IP checking for adb over TCP""Kenny Root2012-03-281-36/+2
|\ \
| * | Revert "add IP checking for adb over TCP"Kenny Root2012-03-281-36/+2
| | | | | | | | | This reverts commit dca76e6187c4128a17c8df5bcaca0db6993d91a1
* | | Merge "add IP checking for adb over TCP"Kenny Root2012-03-281-2/+36
|\ \ \ | |/ /
| * | add IP checking for adb over TCPWei Zhong2012-03-151-2/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | whitelist connection for 1) emulator 2) "eng" or "tests" build, or 3) IP matches with "persist.service.adb.client_ip" Change-Id: I8ac149149873f3bd206bd4d5abc063e5274fb468 Signed-off-by: Wei Zhong <wzhong@google.com>
* | | Make sure "adb install" work is cleaned after errorKenny Root2012-03-261-2/+2
| | | | | | | | | | | | | | | | | | | | | If an error occurs during the verification of an APK, it could be left in the temporary installation directory. Change-Id: I4afa5535fc0b978532b31d5b8fb63776963c39db
* | | Merge "adb: Don't synchronize with transport using sleep"Benoit Goby2012-03-263-13/+19
|\ \ \
| * | | adb: Don't synchronize with transport using sleepBenoit Goby2012-03-163-13/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Services that cause adbd to reboot are currently implemented this way: write(fd, response) close(fd) sleep(1) exit(1) sleep(1) is necessary to leave time for the transport to transmit the response before the daemon exits. This is slow and unreliable. Instead, add a flag to the asocket to make it exit the daemon only after the socket is closed. Change-Id: I9df45ea6221f0d9b828703b9b2316a5d4fe59352
* | | | Merge "Revert "Reimplement the "adb root" command to more closely match its ↵Benoit Goby2012-03-261-2/+4
|\ \ \ \ | |/ / / | | | | | | | | previous behavior""
| * | | Revert "Reimplement the "adb root" command to more closely match its ↵Benoit Goby2012-03-161-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | previous behavior" This reverts commit 535164e9d9649a83d4d63829f3389f2bea339fe1.
* | | | Remove duplicated VENDOR_ID_INTELAndrew Hsieh2012-03-231-3/+0
|/ / / | | | | | | | | | | | | | | | | | | VENDOR_ID_INTEL defined and appear in builtInVendorIds[] twice. Remove the 2nd one. Change-Id: I62f7bba392012aafb8ea9730959362db4bc6c669
* | | adb: Remove unused flagsBenoit Goby2012-03-161-18/+0
|/ / | | | | | | | | | | | | | | | | BUILD_ADBD is always true ANDROID_GADGET is not used in the code anymore. adbd now checks at runtime if /dev/android_adb is present Change-Id: If6c3278606c79cc74d1ef5978e7b8e3a4513aef8
* | Add AID_SDCARD_R.Dianne Hackborn2012-03-081-2/+3
| | | | | | | | Change-Id: I47f650e415e06c0b69790ffefea7f208c910ebd7
* | Enables ADBD tracing in the emulator.Vladimir Chtchetkine2012-02-272-0/+70
| | | | | | | | | | | | | | | | | | | | When running inside the emulator, guest's adbd can connect to 'adb-debug' qemud service that can display adb trace messages on condition that emulator has been started with '-debug adb' option. This CL enables that functionality in ADB code. Change-Id: I59b4a76d3c887ad28b8aa8e2a01dfa814e75faa1
* | Fix 'extra tokens at end of #endif directive' warningAnatol Pomazau2012-02-131-1/+1
| | | | | | | | Change-Id: I464ede415e64cf7db845bb441754120974bcf855
* | am 0c054095: am 746f3243: Add USB vendor IDs for Quanta, INQ and Sony.Xavier Ducrohet2012-01-241-0/+9
|\ \ | |/ | | | | | | * commit '0c05409510037fd7372c3fe7ab240ebf33b15831': Add USB vendor IDs for Quanta, INQ and Sony.
| * am 746f3243: Add USB vendor IDs for Quanta, INQ and Sony.Xavier Ducrohet2012-01-241-0/+9
| |\ | | | | | | | | | | | | * commit '746f3243f6d30ab51a36dcfea76eac3ba29ac625': Add USB vendor IDs for Quanta, INQ and Sony.
| | * Add USB vendor IDs for Quanta, INQ and Sony.Xavier Ducrohet2012-01-241-0/+9
| | | | | | | | | | | | Change-Id: I224e067d9a64e8e9e7afbad0760a4b07f965bf83
* | | am 70580b20: am 149ae11f: Merge "adb,fastboot: add USB support for Intel ↵Jean-Baptiste Queru2012-01-241-0/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | Vendor ID" * commit '70580b20bc8485002df0b3e89e42754c8c9796ff': adb,fastboot: add USB support for Intel Vendor ID
| * | am 149ae11f: Merge "adb,fastboot: add USB support for Intel Vendor ID"Jean-Baptiste Queru2012-01-241-0/+3
| |\ \ | | |/ | |/| | | | | | | * commit '149ae11fb63818b470156e1652abfad0e08d486d': adb,fastboot: add USB support for Intel Vendor ID
| | * adb,fastboot: add USB support for Intel Vendor IDWu, Hao2012-01-171-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | This patch adds Intel USB Vendor ID into the support list for adb and fastboot. Signed-off-by: Wu, Hao <hao.wu@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com>
* | | am daafb531: am 4779e934: Add Intel\'s vendor ID to adbAndrew Hsieh2012-01-201-1/+3
|\ \ \ | |/ / | | | | | | | | | * commit 'daafb531484a35a63e229e14d8a81b412e506670': Add Intel's vendor ID to adb
| * | Add Intel's vendor ID to adbAndrew Hsieh2012-01-181-1/+3
| | | | | | | | | | | | Change-Id: I81da3ea11bfd44395f6895fe51e477ff1e7fa25b
* | | Don't allow adb to run as root in user builds.Nick Kralevich2012-01-192-0/+8
| | | | | | | | | | | | Change-Id: I4fbd7beb7f76c68fead1a89b745f0dfb931b4597
* | | Move permission checking code to it's own function.Nick Kralevich2012-01-191-23/+31
| | | | | | | | | | | | Change-Id: Ibe46ca3043791f3b3815080f9e23ac307b1f5900
* | | am e0b55791: am 07ad9f2a: Add USB Vendor ID for Fujitsu and Lumigon.Xavier Ducrohet2012-01-111-0/+6
|\ \ \ | |/ / | | | | | | | | | * commit 'e0b557915123b7ad022ff5d0a7a3d4dd2ee7c2fe': Add USB Vendor ID for Fujitsu and Lumigon.
| * | Add USB Vendor ID for Fujitsu and Lumigon.Xavier Ducrohet2012-01-111-0/+6
| | | | | | | | | | | | Change-Id: Icd013b362366815527834cbf54aa4ecac2b7750d
| * | Cherry-picked from c4f37eed7 in master. Do not merge.Vladimir Chtchetkine2012-01-101-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Fix the build. Conditionally compile code that is intended to run inside the emulator only. Change-Id: Ie82e415b2ff52395616f85871dddb38e65b0ed55
| * | Cherry-picked from c13daef7b on master. Do not merge.Vladimir Chtchetkine2012-01-101-1/+119
| |/ | | | | | | | | | | Use QEMU pipe for ADB communication when running in emulator. Change-Id: I7934b6272c2a9825d244ce76ff65dbce6e54ebff
* | add "adb sideload" and sideload connection stateDoug Zongker2012-01-104-0/+95
| | | | | | | | | | | | | | | | | | | | Recovery will soon support a minimal implementation of adbd which will do nothing but accept downloads from the "adb sideload" command and install them. This is the client side command (mostly resurrected out of the old circa-2007 "adb recover" command) and the new connection state. Change-Id: I4f67b63f1b3b38d28c285d1278d46782679762a2
* | Tell the user to unlock/confirm backup & restore operationsChristopher Tate2012-01-061-0/+2
| | | | | | | | | | | | | | | | People are being confused about the silent failure of backup/restore when they didn't know they had to unlock the device & confirm the backup/restore operation, so now adb prints a brief reminder. Change-Id: I1b32913f0ad0cf6e30bf235dc975b9e983b533fd
* | Fix the build.Vladimir Chtchetkine2011-12-131-0/+7
| | | | | | | | | | | | Conditionally compile code that is intended to run inside the emulator only. Change-Id: Ie82e415b2ff52395616f85871dddb38e65b0ed55
* | Use QEMU pipe for ADB communication when running in emulator.Vladimir Chtchetkine2011-12-131-1/+119
| | | | | | | | Change-Id: I7934b6272c2a9825d244ce76ff65dbce6e54ebff
* | am 650307df: am b1dfffe6: Fix \'adb backup\' on WindowsChristopher Tate2011-12-121-2/+24
|\ \ | |/ | | | | | | * commit '650307df33fc834c251df71c78b00cc0ae6529b7': Fix 'adb backup' on Windows
| * Fix 'adb backup' on WindowsChristopher Tate2011-12-091-2/+24
| | | | | | | | | | | | | | | | | | | | Use the same call sequence that 'adb pull' uses for creating the output file. adb_open_mode() apparently does not work on Windows hosts. Bug 5733007 Change-Id: I48d719c4657c93e19f6790cf1c6da610d49f5806
| * Fixes ADB crash on Windows due to large number of connections. do not merge.Vladimir Chtchetkine2011-12-051-15/+190
| | | | | | | | | | | | | | | | | | | | | | | | The reason for the crash is that ADB on Windows uses WaitForMultipleObjects to wait on connection events. When number of connections exceeds 64, ADB crashes, because WaitForMultipleObjects API doesn't support more than 64 handles. This CL contains a fixer routine that allows waiting on an arbitrary number of handles. (cherry picked from commit ac52833e48f46dfd9f7c8f86236ee8b437850c0a) Change-Id: I8ad264765e5b38d01a31e42b445f97ea86e49948
* | Merge "Tweak logcat parameters"Christopher Tate2011-12-071-1/+5
|\ \
| * | Tweak logcat parametersChristopher Tate2011-12-071-1/+5
| | | | | | | | | | | | Change-Id: If97ee1eb682d95fa05b5e2003a204a628bd6ae4d
* | | Fixes ADB crash on Windows due to large number of connections.Vladimir Chtchetkine2011-12-011-15/+190
| |/ |/| | | | | | | | | | | | | | | | | The reason for the crash is that ADB on Windows uses WaitForMultipleObjects to wait on connection events. When number of connections exceeds 64, ADB crashes, because WaitForMultipleObjects API doesn't support more than 64 handles. This CL contains a fixer routine that allows waiting on an arbitrary number of handles. Change-Id: I83f712e552018df308318154c27df184015a16ee