summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am c752d6dd: am bf082ffb: Merge "Updated trace.h to recognize ↵Elliott Hughes2014-05-281-1/+2
|\ | | | | | | | | | | | | ATRACE_TAG_BIONIC." * commit 'c752d6dd37a943b2ef64c184a0ff542e78173bc9': Updated trace.h to recognize ATRACE_TAG_BIONIC.
| * am bf082ffb: Merge "Updated trace.h to recognize ATRACE_TAG_BIONIC."Elliott Hughes2014-05-281-1/+2
| |\ | | | | | | | | | | | | * commit 'bf082ffb71c40e4670410b246309a182d9dafcf5': Updated trace.h to recognize ATRACE_TAG_BIONIC.
| | * 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
* | | | am 6445b40e: am 811f2c0b: Merge "system/window.h: add deprecation warnings"Mark Salyzyn2014-05-281-1/+18
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '6445b40e93931dedcb831f38343c031c13b7ddb2': system/window.h: add deprecation warnings
| * | | am 811f2c0b: Merge "system/window.h: add deprecation warnings"Mark Salyzyn2014-05-281-1/+18
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '811f2c0b98d6f8935123221648c96ff975688902': system/window.h: add deprecation warnings
| | * | 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
* | | | | am c4ffa5f6: am c290bed0: Merge "Remove dmesg_restrict"Nick Kralevich2014-05-281-1/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'c4ffa5f62ef256ff286122d0ceea61364aa67e13': Remove dmesg_restrict
| * | | | am c290bed0: Merge "Remove dmesg_restrict"Nick Kralevich2014-05-281-1/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'c290bed0350cded5620ed8dbb68b1cfb07d9828c': Remove dmesg_restrict
| | * | | 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
* | | | | | am a8329a36: am 96109cf3: Merge "Add UID and directory for RELRO sharing ↵Torne (Richard Coles)2014-05-282-0/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support." * commit 'a8329a36ca0e5f5799ec2dd14ae360dc0656b9c9': Add UID and directory for RELRO sharing support.
| * | | | | am 96109cf3: Merge "Add UID and directory for RELRO sharing support."Torne (Richard Coles)2014-05-282-0/+4
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '96109cf36c3dd44e9ecfe4b810e21e77eaf834dc': Add UID and directory for RELRO sharing support.
| | * | | | 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
* | | | | | | am 1e4cfe06: am 5df557f6: Merge "logd: logcat: debuggerd: audit logs to ↵Mark Salyzyn2014-05-273-32/+81
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | events and main" * commit '1e4cfe0636f5ade52e8aabac90166b7040e60d8e': logd: logcat: debuggerd: audit logs to events and main
| * | | | | | am 5df557f6: Merge "logd: logcat: debuggerd: audit logs to events and main"Mark Salyzyn2014-05-273-32/+81
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '5df557f6b05ebde2e3f98affa54ef60b717d4b96': logd: logcat: debuggerd: audit logs to events and main
| | * | | | | 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
* | | | | | | am 769db021: am b24085d5: Merge "adb: Add USB vendor ID for Unowhy"Elliott Hughes2014-05-271-0/+3
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '769db021e6b61d10c13a7b17a72750f18ebdee16': adb: Add USB vendor ID for Unowhy
| * | | | | | am b24085d5: Merge "adb: Add USB vendor ID for Unowhy"Elliott Hughes2014-05-271-0/+3
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'b24085d55b082d802eba699243dba26fbc6ac712': adb: Add USB vendor ID for Unowhy
| | * | | | | 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>
* | | | | | | am c3358875: am 6e7343b8: Merge "adb: implement "adb reverse <local> <remote>""David 'Digit' Turner2014-05-275-101/+198
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'c3358875169b920847a72428f4e8b8f09f7bdf05': adb: implement "adb reverse <local> <remote>"
| * | | | | | am 6e7343b8: Merge "adb: implement "adb reverse <local> <remote>""David 'Digit' Turner2014-05-275-101/+198
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '6e7343b8993fecb2f0600a9e5cff91dd4480a877': adb: implement "adb reverse <local> <remote>"
| | * | | | | 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
* | | | | | am 9196f5f2: am 5fe6fcc3: Merge "Add a zygote 64/32 bit config."Narayan Kamath2014-05-271-0/+12
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '9196f5f2df7890100e8968983680e196e944bd05': Add a zygote 64/32 bit config.
| * | | | | am 5fe6fcc3: Merge "Add a zygote 64/32 bit config."Narayan Kamath2014-05-271-0/+12
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '5fe6fcc35d10c88dd55213dc5b2303ea73c1883b': Add a zygote 64/32 bit config.
| | * | | | 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
* | | | | | am a0962b68: am d917d64f: Merge "Only copy mcontext data from sigcontext."Christopher Ferris2014-05-232-5/+9
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'a0962b687a20dace14b5b2e12d96141a51140cab': Only copy mcontext data from sigcontext.
| * | | | | am d917d64f: Merge "Only copy mcontext data from sigcontext."Christopher Ferris2014-05-232-5/+9
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'd917d64fafb2eca22c9c75a8527eb4e920a9f079': Only copy mcontext data from sigcontext.
| | * | | | 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
* | | | | | | am 21157abc: am 8814bd1d: Merge "include: cleanup for -Wsystem-header"Mark Salyzyn2014-05-239-21/+41
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '21157abcd932e899032689dba120d4f7cb08aa23': include: cleanup for -Wsystem-header
| * | | | | | am 8814bd1d: Merge "include: cleanup for -Wsystem-header"Mark Salyzyn2014-05-239-21/+41
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '8814bd1d24e3ce9476e64ba641d592521fcf80ed': include: cleanup for -Wsystem-header
| | * | | | | 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
* | | | | am 3f69451b: am 818f8004: Merge "logd: used before set warning"Mark Salyzyn2014-05-231-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '3f69451b030917a0f29459e8e9f08b11ec8a980d': logd: used before set warning
| * | | | am 818f8004: Merge "logd: used before set warning"Mark Salyzyn2014-05-231-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '818f80045fe4c925a7739a1d1e69e3ebb3a3dbd9': logd: used before set warning
| | * | | 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
* | | | | | am 0b17e1cf: am 72be6d5e: Merge "cpio: Turn on -Werror"Mark Salyzyn2014-05-232-2/+5
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '0b17e1cf18def9830983aa5c37c7c62e83cf0169': cpio: Turn on -Werror
| * | | | | am 72be6d5e: Merge "cpio: Turn on -Werror"Mark Salyzyn2014-05-232-2/+5
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '72be6d5eea001e7bd1bc7b31e8c7e81a0c4a9cff': cpio: Turn on -Werror
| | * | | | 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
* | | | | am f998116b: am 08c372d1: Merge "libnetutils: Turn on -Werror"Mark Salyzyn2014-05-232-7/+11
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'f998116bb07375c4cfbd35aa4852ff9ca36600ad': libnetutils: Turn on -Werror
| * | | | am 08c372d1: Merge "libnetutils: Turn on -Werror"Mark Salyzyn2014-05-232-7/+11
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '08c372d18ecfc02cf7cba7ef65007118b78762bd': libnetutils: Turn on -Werror