summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 023bc0a4: Merge "Fix deadlocks."Elliott Hughes2014-12-041-3/+3
|\ | | | | | | | | * commit '023bc0a426d0500904d5a9d2ddf4b7dfecf9ce6a': Fix deadlocks.
| * Merge "Fix deadlocks."Elliott Hughes2014-12-031-3/+3
| |\
| | * Fix deadlocks.Bao Haojun2014-05-141-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Close pipe fds[1] as soon as possible. Otherwise it may block when reading from fds[0] even though the child process has exited early and closed its copy of fds[1]. 2. Waitpid after pipe is closed. Otherwise the screencap child process may block while writing fds[1], because the fds[0] is not closed yet. If we close fds[0] first, then the screencap child process will die because of SIGPIPE, and waitpid will return correctly. Change-Id: I433c95a5ba2eb3045727fc39a49fd9557fb1a1d1 Signed-off-by: Bao Haojun <baohaojun@gmail.com>
* | | am bc260206: Merge "Fix build."Dan Albert2014-11-281-10/+11
|\ \ \ | |/ / | | | | | | | | | * commit 'bc2602068d83b0226a614ed143cebd708c5fabd2': Fix build.
| * | Merge "Fix build."Dan Albert2014-11-281-10/+11
| |\ \
| | * | Fix build.Dan Albert2014-11-281-10/+11
| |/ / | | | | | | | | | | | | | | | More UD literals that weren't caught by hammerhead... Change-Id: I6b0abdeef41d1f40c2fe86843b5149925ff6356e
* | | resolved conflicts for merge of 809965cc to lmp-mr1-dev-plus-aospElliott Hughes2014-11-272-96/+0
|\ \ \ | |/ / | | | | | | Change-Id: Ifbfe91b16e44b2acd08de48a5cdd2176bd664d0a
| * | Merge "Lose readlink to toybox."Elliott Hughes2014-11-272-96/+0
| |\ \
| | * | Lose readlink to toybox.Elliott Hughes2014-11-262-96/+0
| | | | | | | | | | | | | | | | Change-Id: I933542dfdec7693f856d7368ff5661957ccabf74
* | | | am ba1552bd: Merge "Clarify the strcmp() with the empty string."Stephen Hines2014-11-271-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'ba1552bd2438a8a47779ed3d05d5ce15bfb5741c': Clarify the strcmp() with the empty string.
| * | | Merge "Clarify the strcmp() with the empty string."Stephen Hines2014-11-261-1/+1
| |\ \ \
| | * | | Clarify the strcmp() with the empty string.Stephen Hines2014-11-261-1/+1
| |/ / / | | | | | | | | | | | | Change-Id: Ie246b3c2de3f19b95693f634b0ebd46bdcf3962b
* | | | am f66486ef: Merge "Fix incorrect path name check."Stephen Hines2014-11-271-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'f66486ef09bfc53da65ca6b4137c47d583f31356': Fix incorrect path name check.
| * | | Merge "Fix incorrect path name check."Stephen Hines2014-11-261-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Fix incorrect path name check.Stephen Hines2014-11-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was caught by clang 3.6's -Wpointer-bool-conversion. The device_path field is a char[256], and thus never NULL. The intention for this code was to check whether or not there is a named path at all. Checking whether this is an empty string matches the original intent. Change-Id: I5ccedc03167e6a457e472089de26130aff7f96e3
* | | | am b553a18a: Merge "Lose dmesg to toybox."Elliott Hughes2014-11-272-59/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'b553a18a02cd90298716c88d9167f877b63a36b6': Lose dmesg to toybox.
| * | | Merge "Lose dmesg to toybox."Elliott Hughes2014-11-262-59/+0
| |\ \ \
| | * | | Lose dmesg to toybox.Elliott Hughes2014-11-252-59/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I29a6bf5e628e29e9b635fac2b23106220e36d6a3
* | | | | am 47f52f24: audio: new stream typesEric Laurent2014-11-261-4/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '47f52f247d6d895878b831de448f19b98225515d': audio: new stream types
| * | | | | audio: new stream typesEric Laurent2014-11-241-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added stream types for internal use by audio policy and audio flinger. Bug: 18067208. Change-Id: I90fd4df9ed5e0d8fb8c220d67e95fd0e32a06f14
* | | | | | am 50ac7725: Merge "Lose nohup to toybox."Elliott Hughes2014-11-262-27/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * commit '50ac7725a5f1c195989888277341f22ab54f979b': Lose nohup to toybox.
| * | | | | Merge "Lose nohup to toybox."Elliott Hughes2014-11-262-27/+0
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Lose nohup to toybox.Elliott Hughes2014-11-252-27/+0
| |/ / / / | | | | | | | | | | | | | | | Change-Id: I2928534bc70c6c77cdc90b658029567f00e7f6ad
* | | | | am c0ac9313: Merge "Only Windows doesn\'t have <sys/uio.h>."Elliott Hughes2014-11-252-7/+10
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'c0ac9313e942fb7d3a027cec41904c18d8841521': Only Windows doesn't have <sys/uio.h>.
| * | | | Merge "Only Windows doesn't have <sys/uio.h>."Elliott Hughes2014-11-252-7/+10
| |\ \ \ \
| | * | | | Only Windows doesn't have <sys/uio.h>.Elliott Hughes2014-11-252-7/+10
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should probably be in libcutils instead, so code that needs to care about Windows can use readv/writev. Change-Id: I7c2ceec3f742cee0e44f69fd4c88459376bd0e08
* | | | | am 9c7e5c7c: Merge "Only Win32 doesn\'t have writev."Elliott Hughes2014-11-251-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '9c7e5c7c33607fce4c91e22dcf38237256450b9a': Only Win32 doesn't have writev.
| * | | | Merge "Only Win32 doesn't have writev."Elliott Hughes2014-11-251-2/+2
| |\ \ \ \
| | * | | | Only Win32 doesn't have writev.Elliott Hughes2014-11-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9b5328cea3c88a75135dcb0711cbb5471e8fa388
* | | | | | am 0b7e6516: Merge "Libion: Remove unused variables"Andreas Gampe2014-11-252-2/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '0b7e651615b9b01b9f3f94b6fb1dcfbbbd02c72b': Libion: Remove unused variables
| * | | | | Merge "Libion: Remove unused variables"Andreas Gampe2014-11-252-2/+3
| |\ \ \ \ \
| | * | | | | Libion: Remove unused variablesAndreas Gampe2014-11-252-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For build-system CFLAGS clean-up, fix unused variables. Fix missing close of file descriptors. Explicitly exit after a fork. Change-Id: I76affbc8647c3a760ed3cacc7f3ada3f59e283b1
* | | | | | | am 705accc2: Merge "Init: Remove unused variables"Andreas Gampe2014-11-256-30/+9
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '705accc2a3e3ab29308454212a6029821426ef4e': Init: Remove unused variables
| * | | | | | Merge "Init: Remove unused variables"Andreas Gampe2014-11-256-30/+9
| |\ \ \ \ \ \
| | * | | | | | Init: Remove unused variablesAndreas Gampe2014-11-246-30/+9
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For build-system CFLAGS clean-up, fix unused variables. Use a #define instead of static variable in a header file. Change-Id: Id47bf38e51644b61a9f3ac1893a16553695f1aac
* | | | | | | am bac1dfa8: Merge "Lmkd: Fix unused variables"Andreas Gampe2014-11-251-2/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'bac1dfa8c09824e1adb22e90e9d3cf617a81ff96': Lmkd: Fix unused variables
| * | | | | | Merge "Lmkd: Fix unused variables"Andreas Gampe2014-11-251-2/+0
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Lmkd: Fix unused variablesAndreas Gampe2014-11-241-2/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For build-system CFLAGS clean-up, fix unused variables. Change-Id: I841192e92585814b8691d544cc48433b2ca1b3d3
* | | | | | am 1690b49e: Merge "Libsuspend: Remove unused variable"Andreas Gampe2014-11-251-1/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '1690b49e631904759737176b4bb285d446655f5d': Libsuspend: Remove unused variable
| * | | | | Merge "Libsuspend: Remove unused variable"Andreas Gampe2014-11-251-1/+0
| |\ \ \ \ \
| | * | | | | Libsuspend: Remove unused variableAndreas Gampe2014-11-241-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For build-system CFLAGS clean-up, remove unused variable. Change-Id: I34bd33fd24b02ee58b64029146c253c61651d45f
* | | | | | | resolved conflicts for merge of 03be4928 to lmp-mr1-dev-plus-aospAndreas Gampe2014-11-253-8/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | Change-Id: I7c72ed2c54ceae19c9dfe8b2e1707f869faad110
| * | | | | | Merge "Healthd: Remove unused variables"Andreas Gampe2014-11-253-8/+0
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Healthd: Remove unused variablesAndreas Gampe2014-11-243-8/+0
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For build-system CFLAGS clean-up, remove unused variables. Change-Id: Ifc5884518bfdb744ea9823b98db544dbe59c20d2
* | | | | | am 077ff309: Merge "Lose mkswap, swapoff, and swapon to toybox."Elliott Hughes2014-11-254-180/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '077ff30954275e635c5faa8b75afcd0a44a78dcc': Lose mkswap, swapoff, and swapon to toybox.
| * | | | | Merge "Lose mkswap, swapoff, and swapon to toybox."Elliott Hughes2014-11-254-180/+0
| |\ \ \ \ \
| | * | | | | Lose mkswap, swapoff, and swapon to toybox.Elliott Hughes2014-11-244-180/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | Change-Id: Iedb371ad0f1f74822b3ff4bc1b7b1f9e6ecd300d
* | | | | | am 75afd633: Merge "Lose printenv to toybox."Elliott Hughes2014-11-252-110/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '75afd63340b2a19ff85e5a577a8a0bdd1ca46d26': Lose printenv to toybox.
| * | | | | Merge "Lose printenv to toybox."Elliott Hughes2014-11-242-110/+0
| |\ \ \ \ \
| | * | | | | Lose printenv to toybox.Elliott Hughes2014-11-242-110/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icdc6766a7ef853bc846fe811fa2ad2284ed8a18f
generated by cgit v1.1 at 2024-10-30 09:42:10 +0000