Nick Kralevich
c290bed035
Merge "Remove dmesg_restrict"
2014-05-28 13:09:34 +00:00
Torne (Richard Coles)
4f3ad823ea
am a8329a36: am 96109cf3: Merge "Add UID and directory for RELRO sharing support."
...
* commit 'a8329a36ca0e5f5799ec2dd14ae360dc0656b9c9':
Add UID and directory for RELRO sharing support.
2014-05-28 10:20:55 +00:00
Torne (Richard Coles)
a8329a36ca
am 96109cf3: Merge "Add UID and directory for RELRO sharing support."
...
* commit '96109cf36c3dd44e9ecfe4b810e21e77eaf834dc':
Add UID and directory for RELRO sharing support.
2014-05-28 10:17:44 +00:00
Torne (Richard Coles)
96109cf36c
Merge "Add UID and directory for RELRO sharing support."
2014-05-28 10:15:46 +00:00
Nick Kralevich
1a6184baf3
Remove dmesg_restrict
...
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
2014-05-27 16:51:11 -07:00
Mark Salyzyn
accd09581e
am 73334e60: am 1e4cfe06: am 5df557f6: Merge "logd: logcat: debuggerd: audit logs to events and main"
...
* commit '73334e60530ac68c8b4686316924c225fd037a84':
logd: logcat: debuggerd: audit logs to events and main
2014-05-27 23:01:16 +00:00
Mark Salyzyn
73334e6053
am 1e4cfe06: am 5df557f6: Merge "logd: logcat: debuggerd: audit logs to events and main"
...
* commit '1e4cfe0636f5ade52e8aabac90166b7040e60d8e':
logd: logcat: debuggerd: audit logs to events and main
2014-05-27 22:57:19 +00:00
Mark Salyzyn
1e4cfe0636
am 5df557f6: Merge "logd: logcat: debuggerd: audit logs to events and main"
...
* commit '5df557f6b05ebde2e3f98affa54ef60b717d4b96':
logd: logcat: debuggerd: audit logs to events and main
2014-05-27 22:55:35 +00:00
Mark Salyzyn
5df557f6b0
Merge "logd: logcat: debuggerd: audit logs to events and main"
2014-05-27 22:53:44 +00:00
Elliott Hughes
bccac026e9
am 8ed26bd6: am 769db021: am b24085d5: Merge "adb: Add USB vendor ID for Unowhy"
...
* commit '8ed26bd6531a8d52dcaff6c14b6fc59749791679':
adb: Add USB vendor ID for Unowhy
2014-05-27 21:49:02 +00:00
Elliott Hughes
8ed26bd653
am 769db021: am b24085d5: Merge "adb: Add USB vendor ID for Unowhy"
...
* commit '769db021e6b61d10c13a7b17a72750f18ebdee16':
adb: Add USB vendor ID for Unowhy
2014-05-27 21:32:01 +00:00
Mark Salyzyn
e4369d68a2
logd: logcat: debuggerd: audit logs to events and main
...
- 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
2014-05-27 14:29:56 -07:00
Elliott Hughes
769db021e6
am b24085d5: Merge "adb: Add USB vendor ID for Unowhy"
...
* commit 'b24085d55b082d802eba699243dba26fbc6ac712':
adb: Add USB vendor ID for Unowhy
2014-05-27 21:29:15 +00:00
Elliott Hughes
b24085d55b
Merge "adb: Add USB vendor ID for Unowhy"
2014-05-27 21:25:29 +00:00
Wing Tseng
56266c75e2
adb: Add USB vendor ID for Unowhy
...
Change-Id: I8bab07734d5b6acb4d8ceaf45b0bab0723f5fe03
Signed-off-by: Wing Tseng <Wing_Tseng@pegatroncorp.com>
2014-05-27 14:23:11 -07:00
Brigid Smith
8c82b35239
Updated trace.h to recognize ATRACE_TAG_BIONIC.
...
Bug: 15116468
Change-Id: If8d4971505ffe5cbc193c6ad71618a5adb8192b6
2014-05-27 12:37:48 -07:00
David 'Digit' Turner
7291ac6082
am 97267755: am c3358875: am 6e7343b8: Merge "adb: implement "adb reverse <local> <remote>""
...
* commit '972677557bd2c3a0678a945765783e85c7ec7b9c':
adb: implement "adb reverse <local> <remote>"
2014-05-27 16:43:45 +00:00
David 'Digit' Turner
972677557b
am c3358875: am 6e7343b8: Merge "adb: implement "adb reverse <local> <remote>""
...
* commit 'c3358875169b920847a72428f4e8b8f09f7bdf05':
adb: implement "adb reverse <local> <remote>"
2014-05-27 16:36:30 +00:00
David 'Digit' Turner
c335887516
am 6e7343b8: Merge "adb: implement "adb reverse <local> <remote>""
...
* commit '6e7343b8993fecb2f0600a9e5cff91dd4480a877':
adb: implement "adb reverse <local> <remote>"
2014-05-27 16:33:16 +00:00
David 'Digit' Turner
6e7343b899
Merge "adb: implement "adb reverse <local> <remote>""
2014-05-27 16:30:31 +00:00
David 'Digit' Turner
2525869419
adb: implement "adb reverse <local> <remote>"
...
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
2014-05-27 16:42:13 +02:00
Torne (Richard Coles)
234f696ea7
Add UID and directory for RELRO sharing support.
...
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
2014-05-27 14:00:29 +01:00
Narayan Kamath
ef386b3fb0
am b5d6c188: am 9196f5f2: am 5fe6fcc3: Merge "Add a zygote 64/32 bit config."
...
* commit 'b5d6c18859424d86339ce895a42084a9c08552fd':
Add a zygote 64/32 bit config.
2014-05-27 11:13:44 +00:00
Narayan Kamath
b5d6c18859
am 9196f5f2: am 5fe6fcc3: Merge "Add a zygote 64/32 bit config."
...
* commit '9196f5f2df7890100e8968983680e196e944bd05':
Add a zygote 64/32 bit config.
2014-05-27 11:10:11 +00:00
Narayan Kamath
9196f5f2df
am 5fe6fcc3: Merge "Add a zygote 64/32 bit config."
...
* commit '5fe6fcc35d10c88dd55213dc5b2303ea73c1883b':
Add a zygote 64/32 bit config.
2014-05-27 11:04:38 +00:00
Narayan Kamath
5fe6fcc35d
Merge "Add a zygote 64/32 bit config."
2014-05-27 11:00:37 +00:00
Christopher Ferris
5a19885641
am 012090e5: am a0962b68: am d917d64f: Merge "Only copy mcontext data from sigcontext."
...
* commit '012090e57b697133ad6f7d989e103d71302749f8':
Only copy mcontext data from sigcontext.
2014-05-23 22:40:58 +00:00
Christopher Ferris
012090e57b
am a0962b68: am d917d64f: Merge "Only copy mcontext data from sigcontext."
...
* commit 'a0962b687a20dace14b5b2e12d96141a51140cab':
Only copy mcontext data from sigcontext.
2014-05-23 22:35:49 +00:00
Mark Salyzyn
881c89c54a
am 7aa8cdfb: am 21157abc: am 8814bd1d: Merge "include: cleanup for -Wsystem-header"
...
* commit '7aa8cdfb317dcb7efb7127b070526df09da05377':
include: cleanup for -Wsystem-header
2014-05-23 22:33:41 +00:00
Mark Salyzyn
7aa8cdfb31
am 21157abc: am 8814bd1d: Merge "include: cleanup for -Wsystem-header"
...
* commit '21157abcd932e899032689dba120d4f7cb08aa23':
include: cleanup for -Wsystem-header
2014-05-23 22:31:24 +00:00
Christopher Ferris
a0962b687a
am d917d64f: Merge "Only copy mcontext data from sigcontext."
...
* commit 'd917d64fafb2eca22c9c75a8527eb4e920a9f079':
Only copy mcontext data from sigcontext.
2014-05-23 22:28:43 +00:00
Mark Salyzyn
21157abcd9
am 8814bd1d: Merge "include: cleanup for -Wsystem-header"
...
* commit '8814bd1d24e3ce9476e64ba641d592521fcf80ed':
include: cleanup for -Wsystem-header
2014-05-23 22:23:57 +00:00
Christopher Ferris
d917d64faf
Merge "Only copy mcontext data from sigcontext."
2014-05-23 22:23:45 +00:00
Mark Salyzyn
8814bd1d24
Merge "include: cleanup for -Wsystem-header"
2014-05-23 22:19:57 +00:00
Christopher Ferris
e484607622
Only copy mcontext data from sigcontext.
...
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
2014-05-23 15:11:26 -07:00
Mark Salyzyn
289e111a00
system/window.h: add deprecation warnings
...
Change-Id: I38de3d281f28e0750b4abb86f28509f98dfc7a72
2014-05-23 15:10:06 -07:00
Mark Salyzyn
4887842c92
include: cleanup for -Wsystem-header
...
- warnings as errors, or errors introduced when -Wsystem-header
was experimentally introduced.
Change-Id: Ia8f5b3c1c1096e191741223d52526aa48c7f1cc4
2014-05-23 15:09:57 -07:00
Mark Salyzyn
38b89f151d
am c37297f3: am 3f69451b: am 818f8004: Merge "logd: used before set warning"
...
* commit 'c37297f3318617849e5930870afb18bbaf91ddb5':
logd: used before set warning
2014-05-23 19:44:01 +00:00
Mark Salyzyn
4b8fde7529
am 0520298e: am 0b17e1cf: am 72be6d5e: Merge "cpio: Turn on -Werror"
...
* commit '0520298e3a58c99bc87a4e8c5f64aa419354159b':
cpio: Turn on -Werror
2014-05-23 19:44:00 +00:00
Mark Salyzyn
3c55219b73
am 04482eab: am f998116b: am 08c372d1: Merge "libnetutils: Turn on -Werror"
...
* commit '04482eaba2584c3a05bff4a6647f0a2e55475a91':
libnetutils: Turn on -Werror
2014-05-23 19:43:32 +00:00
Mark Salyzyn
b87a780240
am 800e8304: am 3bc628b2: am f5e2dc89: Merge "libctest: zap"
...
* commit '800e8304a5fbc40f7d0156941345635fe4e32555':
libctest: zap
2014-05-23 19:34:03 +00:00
Colin Cross
2594f0f6d1
am 2113474a: am 17c3a227: am 617c28b8: Merge "Fix list_for_each_safe macro"
...
* commit '2113474ae090ee4c6a06864011ce8a4e4cae9673':
Fix list_for_each_safe macro
2014-05-23 19:34:02 +00:00
Colin Cross
795e59b32a
am fcc81e3c: am 184eecf0: am 4ecbda41: Merge "Add list_add_head to libcutils"
...
* commit 'fcc81e3c6f0724b3b360b19071005e559334bc58':
Add list_add_head to libcutils
2014-05-23 19:34:02 +00:00
Mark Salyzyn
c37297f331
am 3f69451b: am 818f8004: Merge "logd: used before set warning"
...
* commit '3f69451b030917a0f29459e8e9f08b11ec8a980d':
logd: used before set warning
2014-05-23 17:51:56 +00:00
Mark Salyzyn
0520298e3a
am 0b17e1cf: am 72be6d5e: Merge "cpio: Turn on -Werror"
...
* commit '0b17e1cf18def9830983aa5c37c7c62e83cf0169':
cpio: Turn on -Werror
2014-05-23 17:51:55 +00:00
Mark Salyzyn
3f69451b03
am 818f8004: Merge "logd: used before set warning"
...
* commit '818f80045fe4c925a7739a1d1e69e3ebb3a3dbd9':
logd: used before set warning
2014-05-23 17:48:25 +00:00
Mark Salyzyn
0b17e1cf18
am 72be6d5e: Merge "cpio: Turn on -Werror"
...
* commit '72be6d5eea001e7bd1bc7b31e8c7e81a0c4a9cff':
cpio: Turn on -Werror
2014-05-23 17:48:24 +00:00
Mark Salyzyn
818f80045f
Merge "logd: used before set warning"
2014-05-23 17:42:47 +00:00
Mark Salyzyn
72be6d5eea
Merge "cpio: Turn on -Werror"
2014-05-23 17:42:36 +00:00
Mark Salyzyn
ab4b7308ec
logd: used before set warning
...
Change-Id: I30c078f8b22ebe4dcb48d57adf88b3e51b4fa202
2014-05-23 09:48:09 -07:00