summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* String16.cpp rm unused utils/Debug.hMark Salyzyn2014-05-291-1/+0
| | | | Change-Id: Ie7e3695770f20be33738a0f0a868cc914248d91a
* Merge "Add LD_PRELOAD for libsigchain.so to the environment"Dave Allison2014-05-291-0/+1
|\
| * Add LD_PRELOAD for libsigchain.so to the environmentDave Allison2014-05-151-0/+1
| | | | | | | | | | | | | | | | | | To remove the need to modify the bionic dynamic linker, add the signal chaining library as a preload in the environment. This will be picked up by the dynamic linker and will override sigaction and sigprocmask to allow for signal chaining. Change-Id: I6e2d0628b009bd01e0ed9aed0b311871b9c8363a
* | Merge "Updated trace.h to recognize ATRACE_TAG_BIONIC."Elliott Hughes2014-05-281-1/+2
|\ \
| * | Updated trace.h to recognize ATRACE_TAG_BIONIC.Brigid Smith2014-05-271-1/+2
| | | | | | | | | | | | | | | Bug: 15116468 Change-Id: If8d4971505ffe5cbc193c6ad71618a5adb8192b6
* | | Merge "system/window.h: add deprecation warnings"Mark Salyzyn2014-05-281-1/+18
|\ \ \
| * | | system/window.h: add deprecation warningsMark Salyzyn2014-05-231-1/+18
| | | | | | | | | | | | | | | | Change-Id: I38de3d281f28e0750b4abb86f28509f98dfc7a72
* | | | Merge "Remove dmesg_restrict"Nick Kralevich2014-05-281-1/+0
|\ \ \ \
| * | | | Remove dmesg_restrictNick Kralevich2014-05-271-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dmesg_restrict is too coarse of a control. In Android's case, we want to allow the shell user to see dmesg output, but disallow others from seeing it. Rather than rely on dmesg_restrict, use SELinux to control access to dmesg instead. See corresponding change in external/sepolicy . Bug: 10020939 Change-Id: I9d4bbbd41cb02b707cdfee79f826a39c1ec2f177
* | | | | Merge "Add UID and directory for RELRO sharing support."Torne (Richard Coles)2014-05-282-0/+4
|\ \ \ \ \
| * | | | | Add UID and directory for RELRO sharing support.Torne (Richard Coles)2014-05-272-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define a UID to be used by the process responsible for creating shared RELRO files for the WebView native library, and create a directory owned by that UID to use to store the files. Bug: 13005501 Change-Id: I5bbb1e1035405e5534b2681f554fe16f74e3da1a
* | | | | | Merge "logd: logcat: debuggerd: audit logs to events and main"Mark Salyzyn2014-05-273-32/+81
|\ \ \ \ \ \
| * | | | | | logd: logcat: debuggerd: audit logs to events and mainMark Salyzyn2014-05-273-32/+81
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - auditd spawn log copy to events and main - logcat delete events as one of the default logs - debuggerd do not collect events. - squish multiple spaces - switch from strcpy to memmove for overlapping buffers BUG: 14626551 Change-Id: I89b30273ce931ed2b25a53ea9be48e77f4c1bbf4
* | | | | | Merge "adb: Add USB vendor ID for Unowhy"Elliott Hughes2014-05-271-0/+3
|\ \ \ \ \ \
| * | | | | | adb: Add USB vendor ID for UnowhyWing Tseng2014-05-271-0/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8bab07734d5b6acb4d8ceaf45b0bab0723f5fe03 Signed-off-by: Wing Tseng <Wing_Tseng@pegatroncorp.com>
* | | | | | Merge "adb: implement "adb reverse <local> <remote>""David 'Digit' Turner2014-05-275-101/+198
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | adb: implement "adb reverse <local> <remote>"David 'Digit' Turner2014-05-275-101/+198
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements the logical opposite of 'adb forward', i.e. the ability to reverse network connections from the device to the host. This feature is very useful for testing various programs running on an Android device without root or poking at the host's routing table. Options and parameters are exactly the same as those for 'adb forward', except that the direction is reversed. Examples: adb reverse tcp:5000 tcp:6000 connections to localhost:5000 on the device will be forwarded to localhost:6000 on the host. adb reverse --no-rebind tcp:5000 tcp:6000 same as above, but fails if the socket is already bound through a previous 'adb reverse tcp:5000 ...' command. adb reverse --list list all active reversed connections for the target device. Note: there is no command to list all reversed connections for all devices at once. adb reverse --remove tcp:5000 remove any reversed connection on the device from localhost:5000 adb reverse --remove-all remove all reversed connections form the current device. Reversed connections are tied to a transport, in other words, they disappear as soon as a device is disconnected. Simple testing protocol: adb forward tcp:5000 tcp:6000 adb reverse tcp:6000 tcp:7000 nc -l localhost 7000 in another terminal: echo "Hello" | nc localhost 5000 Will print "Hello" on the first terminal. Change-Id: I761af790cdb06829b68430afa4145a919fa0e6d5
* | | | | Merge "Add a zygote 64/32 bit config."Narayan Kamath2014-05-271-0/+12
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add a zygote 64/32 bit config.Narayan Kamath2014-05-211-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 64 bit zygote is the "primary" and the system server is run as a 64 bit process. Change-Id: Ie1c2b0809faa92937bc407dd66e7a606ebb4f8f3
* | | | | Merge "Only copy mcontext data from sigcontext."Christopher Ferris2014-05-232-5/+9
|\ \ \ \ \
| * | | | | Only copy mcontext data from sigcontext.Christopher Ferris2014-05-232-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ucontext_t data structure could be bigger than the kernel data structure. Since the unwinder only cares about the mcontext data, only copy that out of the structure. The mcontext data is the same size in the kernel and in the ucontext_t structure. Bug: 15189014 Change-Id: I5978169c4425b8212e11db85a57eb319cd0e264b
* | | | | | Merge "include: cleanup for -Wsystem-header"Mark Salyzyn2014-05-239-21/+41
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | |
| * | | | include: cleanup for -Wsystem-headerMark Salyzyn2014-05-239-21/+41
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | - warnings as errors, or errors introduced when -Wsystem-header was experimentally introduced. Change-Id: Ia8f5b3c1c1096e191741223d52526aa48c7f1cc4
* | | | Merge "logd: used before set warning"Mark Salyzyn2014-05-231-1/+1
|\ \ \ \
| * | | | logd: used before set warningMark Salyzyn2014-05-231-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I30c078f8b22ebe4dcb48d57adf88b3e51b4fa202
* | | | | Merge "cpio: Turn on -Werror"Mark Salyzyn2014-05-232-2/+5
|\ \ \ \ \ | |/ / / /
| * | | | cpio: Turn on -WerrorMark Salyzyn2014-05-232-2/+5
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | - Solve st_mode is uint16_t on MAC - Turn on -Werror Change-Id: I67b62424245545099ed283c56dae544153b85425
* | | | Merge "libnetutils: Turn on -Werror"Mark Salyzyn2014-05-232-7/+11
|\ \ \ \
| * | | | libnetutils: Turn on -WerrorMark Salyzyn2014-05-232-7/+11
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | - Get rid of a pair of out of range comparison warnings. - Turn on -Werror for compilation Change-Id: Ie6754f41f9348852a02cc0ff35befb5a76ac2883
* | | | Merge "libctest: zap"Mark Salyzyn2014-05-223-358/+0
|\ \ \ \
| * | | | libctest: zapMark Salyzyn2014-05-223-358/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related Changes: - https://android-review.googlesource.com/#/c/95364 - https://googleplex-android-review.git.corp.google.com/#/c/470584 - https://googleplex-android-review.git.corp.google.com/#/c/470591 - https://googleplex-android-review.git.corp.google.com/#/c/470590 Change-Id: I28a017104f48cc4216df876eb9102ecd332d28e3
* | | | | Merge "Fix list_for_each_safe macro"Colin Cross2014-05-221-3/+3
|\ \ \ \ \
| * | | | | Fix list_for_each_safe macroThierry Escande2014-05-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The second macro parameter is named 'next' like listnode structure 'next' field. Since the precompiler will expand all 'next' occurrences in the macro definition with what is passed by the caller, it is not possible to call this macro with something else than 'next' as second parameter. This patch replaces the 'next' parameter with 'n' allowing use of a next node not named 'next'. Change-Id: I78c859caf8193f21fe0bedaeaa8342d6e89ad14b Signed-off-by: Thierry Escande <thierry.escande@linux.intel.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
* | | | | | Merge "Add list_add_head to libcutils"Colin Cross2014-05-221-0/+8
|\ \ \ \ \ \
| * | | | | | Add list_add_head to libcutilsSamuel Ortiz2014-05-131-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a node to the head of the linked list. Change-Id: I03fc81f348c5c4fdab8680928b6e353413e4bc3c Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> Signed-off-by: Yong Yao <yong.yao@intel.com>
* | | | | | | Merge "ueventd: support by-name symlinks for PCI block devices"Colin Cross2014-05-221-6/+44
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | ueventd: support by-name symlinks for PCI block devicesAndrew Boie2014-05-131-6/+44
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To ensure that well-crafted removable media can't spoof the internal partitions, for platform devices the controller id is inside the generated path. We now do the same for PCI devices. The generated path has two levels; the PCI domain/bus, and then the peripheral ID. This lets us get by-name symlinks for PCI media, such as the SATA controllers on PC-like hardware. The symlinks will be created under /dev/block/pci/. For example: /dev/block/pci/pci0000:00/0000:00:1f.2/by-name/ Change-Id: Icee3e86bef5569c2bbd94c26bc00d49028345e3b Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
* | | | | | Merge "libusbhost: Turn on -Werror"Mark Salyzyn2014-05-221-1/+3
|\ \ \ \ \ \
| * | | | | | libusbhost: Turn on -WerrorMark Salyzyn2014-05-211-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia765b56197c28d6cde633db9c429001993f75f17
* | | | | | | Merge "libsuspend: Turn on -Werror"Mark Salyzyn2014-05-221-0/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | libsuspend: Turn on -WerrorMark Salyzyn2014-05-211-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4ea982ab7d68a596ac79d93a01c05a109d24672d
* | | | | | | Merge "libion: Turn on -Werror"Mark Salyzyn2014-05-221-1/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | libion: Turn on -WerrorMark Salyzyn2014-05-211-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0a933623147fb7bfb7251b1d9213cc174619ed42
* | | | | | | Merge "sdcard: Turn on -Werror"Mark Salyzyn2014-05-221-4/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | sdcard: Turn on -WerrorMark Salyzyn2014-05-211-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I40fce5a69a898e79542aa7688d077ff7bc40ed4f
* | | | | | | Merge "reboot: Turn on -Werror"Mark Salyzyn2014-05-221-4/+6
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | reboot: Turn on -WerrorMark Salyzyn2014-05-211-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic3186e457b80ee6149ef89321b0d16422872aea7
* | | | | | | Merge "Remove libstdc++ dependency from host libbacktrace"Dan Albert2014-05-221-0/+3
|\ \ \ \ \ \ \
| * | | | | | | Remove libstdc++ dependency from host libbacktraceDan Albert2014-05-211-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The libc++ version of libbacktrace on the host was still linking against libstdc++, and this was causing problems in art. Change-Id: I1d14fb9e18abd074affcf46c8044407041970669
* | | | | | | | Merge "Remove unnecessary #includes of <sys/atomics.h>."Elliott Hughes2014-05-222-3/+0
|\ \ \ \ \ \ \ \