summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 2690482a: am 55e1df47: Merge "debuggerd: Fix minor memory leak"Elliott Hughes2013-03-201-0/+1
|\ | | | | | | | | * commit '2690482a35562fc2f5c8a2164f10ffba1d27e599': debuggerd: Fix minor memory leak
| * am 55e1df47: Merge "debuggerd: Fix minor memory leak"Elliott Hughes2013-03-201-0/+1
| |\ | | | | | | | | | | | | * commit '55e1df471bb6e786c46a64d7ea99e224a6c46af2': debuggerd: Fix minor memory leak
| | * Merge "debuggerd: Fix minor memory leak"Elliott Hughes2013-03-201-0/+1
| | |\
| | | * debuggerd: Fix minor memory leakLiangtao Gao2013-03-201-0/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | free_ptrace_context(context) doesn't free(context), which leaks the memory allocated to context. Change-Id: Ic199b257aefc9a05ec2d902958efa8a57a601fb1 Signed-off-by: Liangtao Gao <gliangtao@gmail.com>
* | | cutils: trace: add asynchronous eventsAlex Ray2013-03-181-0/+41
| | | | | | | | | | | | Change-Id: Ia09d34cbc6c8c85fb3d0f1a7e95de53d1b79e998
* | | am e657e0c2: am 1a2bdd6f: Merge "liblog: fix fd leakage"Nick Kralevich2013-03-151-1/+3
|\ \ \ | |/ / | | | | | | | | | * commit 'e657e0c2a4a30104c650e7ad8827e8e887af0cb9': liblog: fix fd leakage
| * | am 1a2bdd6f: Merge "liblog: fix fd leakage"Nick Kralevich2013-03-151-1/+3
| |\ \ | | |/ | | | | | | | | | * commit '1a2bdd6fbef8119e05be703658ef7fa2017ecf6e': liblog: fix fd leakage
| | * Merge "liblog: fix fd leakage"Nick Kralevich2013-03-151-1/+3
| | |\
| | | * liblog: fix fd leakageNick Kralevich2013-03-151-1/+3
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | File descriptors remain open across an exec unless FD_CLOEXEC is set. Add O_CLOEXEC to the open() call to prevent file descriptor leakage. In particular, the following program will eventually run out of file descriptors: int main(int argc, char **argv) { printf("===== entering main =====\n"); ALOGW("entering main"); system("ls -l /proc/self/fd/"); execv(argv[0], argv); printf("exec failed\n"); return -1; } Change-Id: I5be43ab3b9f82a05f242b1f586454c50568af388
* | | liblogwrap: lock android_fork_execvpRom Lemarchand2013-03-141-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add a lock around android_fork_execvp to ensure no two threads can execute it at the same time. This is to help with http://b/8333626 Change-Id: I75d087a74b58f5b8e878675b301200f54d976fb2
* | | am c8c95f86: am 80dac350: Merge "ueventd: allow platform devices to have ↵Colin Cross2013-03-140-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | just a /devices/ prefix" * commit 'c8c95f86712989003ddd9c55261942d0d83ca9f4': ueventd: allow platform devices to have just a /devices/ prefix
| * | am 80dac350: Merge "ueventd: allow platform devices to have just a /devices/ ↵Colin Cross2013-03-141-39/+44
| |\ \ | | |/ | | | | | | | | | | | | | | | prefix" * commit '80dac35023bb7860b7382ca995e19710bd894e7e': ueventd: allow platform devices to have just a /devices/ prefix
| | * Merge "ueventd: allow platform devices to have just a /devices/ prefix"Colin Cross2013-03-151-39/+44
| | |\
| | | * ueventd: allow platform devices to have just a /devices/ prefixDima Zavin2013-03-141-39/+44
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using device tree, platform devices may not have a /devices/platform/ path prefix, but can be rooted in /devices/. Modify the platform device tracking code to store the device path as well as the name. This way, when we create symlinks, we can correctly skip the base platform device prefix and get to the proper device node path. Change-Id: I939ef8fbcb45c5c803cd9a054e40136a912efc72 Signed-off-by: Dima Zavin <dima@android.com>
* | | am 3e77b752: am 0b535558: Merge "Unwinding implementation via eh_frame ↵Elliott Hughes2013-03-145-28/+910
|\ \ \ | |/ / | | | | | | | | | | | | | | | sections for x86" * commit '3e77b7521ba96fd1ff6fed0e019aff5f46a31428': Unwinding implementation via eh_frame sections for x86
| * | am 0b535558: Merge "Unwinding implementation via eh_frame sections for x86"Elliott Hughes2013-03-145-28/+910
| |\ \ | | |/ | | | | | | | | | * commit '0b5355589429cabac0e16f36c6e6541f8aafba08': Unwinding implementation via eh_frame sections for x86
| | * Merge "Unwinding implementation via eh_frame sections for x86"Elliott Hughes2013-03-145-28/+910
| | |\
| | | * Unwinding implementation via eh_frame sections for x86Pavel Chupin2013-03-145-28/+910
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backtracing through eh_frame section is more effective allowing to reuse ebp register for other purposes within routine. GCC with turned on optimizations (-O1 and above) implicitly defines -fomit-frame-pointer anyway. eh_frame sections are generated by default with GCC on any optimization level. This change implements remote unwinding (separate process unwinding). Local unwinding is already implemented through _Unwind_Backtrace call which is implemented in libgcc. Change-Id: I1aea1ecd19c21710f9cf5f05dc272fc51b67b7aa Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
* | | | am 9573a175: am dbf4937b: Merge "Revert "init: Set ADDR_COMPAT_LAYOUT before ↵Nick Kralevich2013-03-141-16/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | spawning processes."" * commit '9573a1755c4ef0f6f86277fcf2ff95645bb1dfb4': Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes."
| * | | am dbf4937b: Merge "Revert "init: Set ADDR_COMPAT_LAYOUT before spawning ↵Nick Kralevich2013-03-141-16/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | processes."" * commit 'dbf4937b5a1ef4ceed49e13527f50514c510ebd4': Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes."
| | * | Merge "Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes.""Nick Kralevich2013-03-141-16/+0
| | |\ \ | | | |/ | | |/|
| | | * Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes."Nick Kralevich2013-03-141-16/+0
| | |/ | | | | | | | | | | | | | | | | | | | | | This logic has been moved to platform/frameworks/base commit 8a0a929422682ba3eb6a205dc6c0638e68b909de and is no longer needed here. This reverts commit 01b1dee0ab7ad649760f9d8a7cead2a3f6d9cf70.
* | | Add symlink to bugreport storage location.Jeff Sharkey2013-03-141-0/+3
| | | | | | | | | | | | Change-Id: I16f024c24767cfa1f5800d568d39fb098a408127
* | | Merge "Add vendor IDs to adb" into jb-mr2-devSam Lin2013-03-131-0/+9
|\ \ \
| * | | 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 1d77e6e4: am 3960ec22: Merge "mkbootimg: support 8192/16384 pagesizes"Colin Cross2013-03-121-2/+3
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '1d77e6e4e3d304f86d0cfa2cfcf5266192420cae': mkbootimg: support 8192/16384 pagesizes
| * | | am 3960ec22: Merge "mkbootimg: support 8192/16384 pagesizes"Colin Cross2013-03-121-2/+3
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit '3960ec226d07c7327ac6967a2977c521fd4884b6': mkbootimg: support 8192/16384 pagesizes
| | * | Merge "mkbootimg: support 8192/16384 pagesizes"Colin Cross2013-03-121-2/+3
| | |\ \
| | | * | mkbootimg: support 8192/16384 pagesizesIthamar R. Adema2013-03-101-2/+3
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | By now these sizes are very common, so make sure we support them. Change-Id: Ib1963fbabc4ec0b4623f2045a3cbeedffbad7ee8 Signed-off-by: Ithamar R. Adema <ithamar@upgrade-android.com>
* | | | liblogwrap: replace loops with calls to TEMP_FAILURE_RETRYRom Lemarchand2013-03-121-6/+2
| |_|/ |/| | | | | | | | | | | | | | Makes the code slightly more readable and avoids boilerplate. Change-Id: I023d9a1e1de729deaec97c62a5ca7983b6918f94
* | | am c8b3fee4: am f9094401: am 75f29709: am 09b43645: (-s ours) am 92b2cd23: ↵Jean-Baptiste Queru2013-03-110-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'c8b3fee48ca53150b38d84c70e2679f91d293efb':
| * | am f9094401: am 75f29709: am 09b43645: (-s ours) am 92b2cd23: (-s ours) ↵Jean-Baptiste Queru2013-03-110-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | Reconcile with jb-mr1-release - do not merge * commit 'f9094401491ecee8e574b294a22e850bfc2b5043':
| | * \ am 75f29709: am 09b43645: (-s ours) am 92b2cd23: (-s ours) Reconcile with ↵Jean-Baptiste Queru2013-03-110-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-release - do not merge * commit '75f29709af6d053168402dd12cdf8b0a58b0c35e': charger: Do not suspend when disconnecting from charger charger: suspend enable in charger mode libsuspend: compile as a static library
| | | * \ am 09b43645: (-s ours) am 92b2cd23: (-s ours) Reconcile with jb-mr1-release ↵Jean-Baptiste Queru2013-03-110-0/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - do not merge * commit '09b43645514669b3ff8181b0a111bc14576e3699': charger: Do not suspend when disconnecting from charger charger: suspend enable in charger mode libsuspend: compile as a static library
| | | | * \ am 92b2cd23: (-s ours) Reconcile with jb-mr1-release - do not mergeJean-Baptiste Queru2013-03-110-0/+0
| | | | |\ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '92b2cd23f708c9aeed146e995807dce080b57d1a': charger: Do not suspend when disconnecting from charger charger: suspend enable in charger mode libsuspend: compile as a static library
| | | | * | Reconcile with jb-mr1-release - do not mergeJean-Baptiste Queru2013-03-110-0/+0
| | | | |\ \
* | | | | | | ueventd: allow platform devices to have just a /devices/ prefix - DO NOT MERGEDima Zavin2013-03-111-39/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using device tree, platform devices may not have a /devices/platform/ path prefix, but can be rooted in /devices/. Modify the platform device tracking code to store the device path as well as the name. This way, when we create symlinks, we can correctly skip the base platform device prefix and get to the proper device node path. Change-Id: I939ef8fbcb45c5c803cd9a054e40136a912efc72 Signed-off-by: Dima Zavin <dima@android.com>
* | | | | | | 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
| * | | | | | am fd5c6b9f: Merge "Close adb_usb.ini after reading it"Elliott Hughes2013-03-081-0/+1
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | * commit 'fd5c6b9f137940ce2d762c85dfdb4d2f1104f2bd': 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
* | | | | | | | fastboot: add support for some obscure args.JP Abgrall2013-03-072-53/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some devices use mkbootimg with weird args for which fastboot only a hardcoded value. Now fastboot recognizes those args. Made handling of global vars more consistent. Bug: 8341331 Change-Id: Ic09f148ccd0249f49935fdc63e517cf8ab2229bc
* | | | | | | | Merge "init: prevent action being added to the action_queue twice" into ↵Colin Cross2013-03-071-1/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev
| * | | | | | | | init: prevent action being added to the action_queue twiceColin Cross2013-03-071-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Property triggers may cause an action to be queued twice, resulting in a loop in the action queue. Keep actions that are not on the queue in the list_empty state (act->qlist->next == act->qlist), and only add them to the list if they are in that state. Bug: 8335133 Change-Id: I3a3ec18176cf19cbaa3a45220a03c7560eacfe79
* | | | | | | | | Merge "charger: accomodate minui change" into jb-mr2-devDoug Zongker2013-03-071-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | charger: accomodate minui changeDoug Zongker2013-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gr_text() now takes an argument requesting bold text instead of regular. Change-Id: I18b54f05ae4a89cb753fa5977a870f1bc827b963
* | | | | | | | | Merge "move goldfish stuffs to device/generic/goldfish" into jb-mr2-devKeun young Park2013-03-065-212/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | move goldfish stuffs to device/generic/goldfishKeun young Park2013-03-055-212/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - each files will be pulled in emulator.mk as PRODUCT_COPY_FILES Change-Id: I4772e2fd863e6d2663f477c3acd8a90cb95b498a
* | | | | | | | | | sync: factor sw_sync functionality out of headerAlex Ray2013-03-052-8/+37
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I13127abe1cd07cd52b35ff43902579478505ccf4