summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Fold uevent message origin checking from init into libcutils."Nick Kralevich2011-04-274-108/+29
| | | | | | This reverts commit 8405ec0e7562a370174d9973dd94984c47e49c36. The original change does not compile.
* Merge "Fold uevent message origin checking from init into libcutils."Nick Kralevich2011-04-274-29/+108
|\
| * Fold uevent message origin checking from init into libcutils.Vernon Tang2011-04-274-29/+108
| | | | | | | | Change-Id: I1a38e611a7ad990f74306ce453740a1eeed2416d
* | Merge "libsysutils: SocketListener: handle recv errors more gracefully."Nick Kralevich2011-04-271-2/+3
|\ \ | |/
| * libsysutils: SocketListener: handle recv errors more gracefully.Vernon Tang2011-04-271-2/+3
|/ | | | | | | Don't close the socket when onDataAvailable returns false if the socket is connectionless. Change-Id: Ie19497f5928144c463d92aa72ba517e675549ea6
* Merge "adb: fix typo in helptext"Mike Lockwood2011-04-261-1/+1
|\
| * adb: fix typo in helptextBernhard Reutner-Fischer2011-04-261-1/+1
|/ | | | | | | s/ocmmand/command Change-Id: I4ed17e8df9dc71a28e1caef5a21f6351e92628af Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
* Merge "pixelflinger: Provide more scanline shortcut functions."David 'Digit' Turner2011-04-251-40/+842
|\
| * pixelflinger: Provide more scanline shortcut functions.David 'Digit' Turner2011-04-161-40/+842
|/ | | | | | | | | | | | | | | | | | | This patch adds a dozen more "shortcut" scanline-processing functions to pixel-flingers. All of them avoid using the JIT for the corresponding operation (on ARM), or using the generic and _extremely_ slow 'scanline' function (on x86, where there is no JIT). The shortcuts were selected by running the system under emulation (build full_x86-eng, then launch emulator-x86), and correspond to operations that are in use when using the system's typical UI features. This makes it much more responsive and amenable to testing most applications, at least those that don't use OpenGL ES heavily. Note that HW OpenGLES emulation is under completion and should solve this problem entirely, though is not there yet. Change-Id: I9c73ba21ad158d6cc5532fabe7ed2419e00ecb3f
* Merge "In serial, skip over port as well if numbers found after colon."Mike Lockwood2011-04-061-2/+28
|\
| * In serial, skip over port as well if numbers found after colon.Terence Haddock2011-04-061-2/+28
|/ | | | Change-Id: Icd45f570a9527790eb0cd614a3f77da1a72375b1
* Merge changes Icdefb5ff,Icd7f5f03Brad Fitzpatrick2011-03-233-3/+41
|\ | | | | | | | | | | * changes: Fix potential race introduced in Icd7f5f03 SocketClient: add optional reference counting
| * Fix potential race introduced in Icd7f5f03Brad Fitzpatrick2011-03-223-17/+23
| | | | | | | | | | | | | | | | | | | | | | | | Digit wrote: "You probably don't want to close the socket here without updating c->socket as well. Otherwise, another thread holding a handle to the client after the c->decRef() could end up sending a message to a different socket, if the file descriptor index is reused by another client in the meantime." Change-Id: Icdefb5ffc0c7607325d7db761e1f04e5d868bfb7
| * SocketClient: add optional reference countingBrad Fitzpatrick2011-03-223-2/+34
| | | | | | | | | | | | | | Needed to fix a race in netd. Bug: 3438459 Change-Id: Icd7f5f035510235f733a25c0621479d3e644b152
* | Merge "libsysutils: Fix a file descriptor leak."Brad Fitzpatrick2011-03-231-0/+1
|\ \ | |/
| * libsysutils: Fix a file descriptor leak.David 'Digit' Turner2011-03-221-0/+1
| | | | | | | | | | | | | | | | The recent refactoring of the select() loop in SocketListener missed a close() of the file descriptor when the onDataAvailable() callback returns false. Change-Id: I767caefab4b98ab350f2db2497ee2bd630f20850
* | Merge "libsysutils: Fix race condition in SocketListener thread."Brad Fitzpatrick2011-03-232-27/+52
|\ \ | |/
| * libsysutils: Fix race condition in SocketListener thread.David 'Digit' Turner2011-03-222-27/+52
| | | | | | | | | | | | | | | | + Handle EINTR in accept(), write() and select() + Fix a memory leak when deleting the mClients list + Fix typo in SocketListener.h Change-Id: Ie68bb3e2dbefe0dfdaa22a5cd06a42dbc4c0f8aa
* | Merge "libsysutils: Handle EINTR in SocketClient::sendData()"Brad Fitzpatrick2011-03-231-13/+29
|\ \ | |/
| * libsysutils: Handle EINTR in SocketClient::sendData()David 'Digit' Turner2011-03-221-13/+29
|/ | | | | | + Improve allocation code in sendMsg(code,msg,addErrno) Change-Id: Ib5fe84bec1a167c369e7ba759acea395e832f6b5
* Merge "x86: Add vold.fstab to mount the SD card"David Turner2011-03-021-0/+4
|\
| * x86: Add vold.fstab to mount the SD cardJun Nakajima2011-02-131-0/+4
| | | | | | | | | | Change-Id: Ie1f70a22dd4e27e8ea956d5e627877d1e2379b95 Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>
* | am bd8f4a85: Merge "Define O_BINARY for non-Windows platforms."Raphael Moll2011-03-018-0/+62
|\ \ | | | | | | | | | | | | * commit 'bd8f4a85ce45649dc75fbef139f0deae12f834a7': Define O_BINARY for non-Windows platforms.
| * \ Merge "Define O_BINARY for non-Windows platforms."Raphael Moll2011-02-228-0/+62
| |\ \ | | |/ | |/|
| | * Define O_BINARY for non-Windows platforms.Raphael Moll2011-02-168-0/+62
| |/ | | | | | | | | | | | | | | | | | | All tools (aapt, aidl, dexdump, etc.) need this flag to open() binary files, or they risk reading corrupted data on Windows. A bunch of these tools just conditionaly define O_BINARY in their C files. Seems it would just make sense to define it globally. Change-Id: Ia5c0a59e9e77bbdcbce235233555f611207abed8
* | am 034117e4: Merge changes ↵Mike Lockwood2011-02-039-102/+164
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | I8df51128,Ie922b3e7,I31f78419,I7e8df44d,I6067857b,Ifd35587c,Ie8d66740 * commit '034117e47f2601d46563461a0bfe3cc22f89a0f0': Fix adb leaking file descriptors to forked processes adb: Fix command-line parser. adb: Increase device descriptor buffer size in Linux host USB support adb: improve debug traces readability. adb: Don't report negative number of bytes after pushing file > 2 gigabytes Adding Texas Instruments to the VID list. Support an additional alias for 'adb shell.'
| * Merge changes ↵Mike Lockwood2011-02-039-102/+164
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I8df51128,Ie922b3e7,I31f78419,I7e8df44d,I6067857b,Ifd35587c,Ie8d66740 * changes: Fix adb leaking file descriptors to forked processes adb: Fix command-line parser. adb: Increase device descriptor buffer size in Linux host USB support adb: improve debug traces readability. adb: Don't report negative number of bytes after pushing file > 2 gigabytes Adding Texas Instruments to the VID list. Support an additional alias for 'adb shell.'
| | * Fix adb leaking file descriptors to forked processesBenoit Goby2011-02-034-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | accept() creates a new file descriptor that should be closed on exec so that forked processes don't keep a fd opened on the socket. This also fixes b/3297070 where adb hangs after running adb on the target. Change-Id: I8df511289e5549ae49b4824c9dfb71a3bf85eae8
| | * adb: Fix command-line parser.David 'Digit' Turner2011-02-031-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the command-line parser to accept both "daemon server" and "server nodaemon". Before the patch, the second string would ignore the "nodaemon" flag. Fixes b/2191598 Change-Id: Ie922b3e7bf57a6e334fc448cec33fb340ca6abc4
| | * adb: Increase device descriptor buffer size in Linux host USB supportMike Lockwood2011-02-031-1/+1
| | | | | | | | | | | | | | | | | | | | | 256 bytes wasn't big enough for some complicated USB configurations Change-Id: I31f7841953d73b06958f44040f58166b159faff4 Signed-off-by: Mike Lockwood <lockwood@android.com>
| | * adb: improve debug traces readability.David 'Digit' Turner2011-02-032-94/+124
| | | | | | | | | | | | | | | | | | | | | This patch makes the traces easier to read. For example transports are displayed by name/serial instead of their hex address. Change-Id: I7e8df44ddbec19754d63d989bd56485998b4627b
| | * adb: Don't report negative number of bytes after pushing file > 2 gigabytesMike Lockwood2011-02-031-2/+2
| | | | | | | | | | | | | | | | | | | | | BUG: 3198322 Change-Id: I6067857b9490984a21b597f6ee338446a9decaf5 Signed-off-by: Mike Lockwood <lockwood@android.com>
| | * Adding Texas Instruments to the VID list.Alex Sakhartchouk2011-02-031-0/+3
| | | | | | | | | | | | Change-Id: Ifd35587c93ae7d5c8253f477a92cca2345dc8bb5
| | * Support an additional alias for 'adb shell.'Daniel Sandler2011-02-031-2/+18
| |/ | | | | | | Change-Id: Ie8d667407fef8ee5a6c7ab86b30307fb61869170
* | am 4585e0e9: Merge changes I087d0074,I8a51924eBrad Fitzpatrick2011-01-253-5/+22
|\ \ | |/ | | | | | | | | * commit '4585e0e9f76e2c51a7f4a9679ec8b8d25f9b5e63': Permit 0 length writes. Let SocketClient users write binary data to clients.
| * Merge changes I087d0074,I8a51924eBrad Fitzpatrick2011-01-253-5/+22
| |\ | | | | | | | | | | | | | | | * changes: Permit 0 length writes. Let SocketClient users write binary data to clients.
| | * Permit 0 length writes.Brad Fitzpatrick2011-01-061-0/+4
| | | | | | | | | | | | Change-Id: I087d0074c8d9e13ce814187475966da94f693fc0
| | * Let SocketClient users write binary data to clients.Brad Fitzpatrick2011-01-063-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a dependency for the DNS proxy CLs. This CL also adds a new socket for the netd process to inherit which is owned by the inet group. (so only apps with the INTERNET permission can use the DNS proxy...) Change-Id: I8a51924e0ed56c6066f77e6f1b02d39bdadac51e
* | | am cdeba125: Merge "Assembly coded android_memset16 and android_memset32"Jean-Baptiste Queru2011-01-078-1/+1334
|\ \ \ | |/ / | | | | | | | | | * commit 'cdeba1258b511b6df450221bcfb2572e5523558a': Assembly coded android_memset16 and android_memset32
| * | Merge "Assembly coded android_memset16 and android_memset32"Jean-Baptiste Queru2011-01-078-1/+1334
| |\ \
| | * | Assembly coded android_memset16 and android_memset32Bruce Beare2011-01-028-1/+1334
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifa05006df7ce7364d18eb10d64a818d619664475 Author: Lu, Hongjiu <hongjiu.lu@intel.com> Signed-off-by: Mark Gross <mark.gross@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
* | | | am fc0b4ff1: Merge "init: Fix parser line numbering"Jean-Baptiste Queru2011-01-072-5/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'fc0b4ff1c8675be3626510a5adfbcae507ecfa43': init: Fix parser line numbering
| * | | Merge "init: Fix parser line numbering"Jean-Baptiste Queru2011-01-072-5/+9
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * init: Fix parser line numberingBruce Beare2011-01-022-5/+9
| |/ | | | | | | | | Change-Id: I3885dd7d631e7330d92780df822b3ee1a8d0350b Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
* | am f7ca6040: Fix infinite loop in init when debugging is turned offColin Cross2011-01-041-6/+6
|\ \ | |/ |/| | | | | * commit 'f7ca6040616f672a6f0039d55e39c610b7c1cf91': Fix infinite loop in init when debugging is turned off
| * Fix infinite loop in init when debugging is turned offColin Cross2011-01-041-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | If a keychord is pressed when debugging is turned off, the main event poll in init will return an event on the keychord fd, but handle_keychord never reads the data. Once this happens, the poll will always return immediately, and init enters an infinite loop. Fix it by always reading from the keychord fd, but only handling the returned keychord if debugging is enabled. Change-Id: Ie4efa98247d3cc978d275dc8a4516b32aa710278
* | Merge "fastboot: Add help message for continue command"Jean-Baptiste Queru2010-12-291-0/+1
|\ \
| * | fastboot: Add help message for continue commandBruce Beare2010-12-291-0/+1
|/ / | | | | | | | | Change-Id: I578b1b7c2d74d09d44ce9100bfe582aaa25c31b1 Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
* | am cbb9257a: Merge "Fix debuggerd (native crash dump)."Jean-Baptiste Queru2010-12-141-10/+19
|\ \ | | | | | | | | | | | | * commit 'cbb9257a872a0f35b0aa1018410ca6025e628c36': Fix debuggerd (native crash dump).
| * \ Merge "Fix debuggerd (native crash dump)."Jean-Baptiste Queru2010-12-141-10/+19
| |\ \