Eric Laurent
c3ef95f1e4
am d502cb34: (-s ours) DO NOT MERGE - audio: added definitions for audio routing extensions
...
* commit 'd502cb34834633d5d6de21620088d9ededa838f3':
DO NOT MERGE - audio: added definitions for audio routing extensions
2014-05-29 00:42:12 +00:00
The Android Automerger
f87012e0ab
am e3e04a16: merge in master-release history after reset to 3db03a5ab0
...
* commit 'e3e04a16fdc039af92c2cb7a4273b568f30d4537':
logd: logcat: Add persist.logd.size group of properties
logd: default off by-UID spam filter
logd: logcat: Add persist.logd.size group of properties
logd: default off by-UID spam filter
logd: transitory reader thread create should be detached
Merge "Fix entry handling for 0 length entries."
liblog: high CPU usage from logcat
2014-05-29 00:42:12 +00:00
Elliott Hughes
540a1849cb
am b3697ec2: am c752d6dd: am bf082ffb: Merge "Updated trace.h to recognize ATRACE_TAG_BIONIC."
...
* commit 'b3697ec2cb75d4f13c22a54b0ef90f4e8fb46e02':
Updated trace.h to recognize ATRACE_TAG_BIONIC.
2014-05-28 22:17:56 +00:00
Mike Lockwood
1142d8ecea
Merge "audio: Add AUDIO_DEVICE_IN_BLUETOOTH_A2DP"
2014-05-28 21:53:41 +00:00
Elliott Hughes
b3697ec2cb
am c752d6dd: am bf082ffb: Merge "Updated trace.h to recognize ATRACE_TAG_BIONIC."
...
* commit 'c752d6dd37a943b2ef64c184a0ff542e78173bc9':
Updated trace.h to recognize ATRACE_TAG_BIONIC.
2014-05-28 21:45:12 +00:00
Elliott Hughes
c752d6dd37
am bf082ffb: Merge "Updated trace.h to recognize ATRACE_TAG_BIONIC."
...
* commit 'bf082ffb71c40e4670410b246309a182d9dafcf5':
Updated trace.h to recognize ATRACE_TAG_BIONIC.
2014-05-28 21:41:25 +00:00
Elliott Hughes
bf082ffb71
Merge "Updated trace.h to recognize ATRACE_TAG_BIONIC."
2014-05-28 21:35:57 +00:00
Eric Laurent
d502cb3483
DO NOT MERGE - audio: added definitions for audio routing extensions
...
Added definitons and structures for new audio routing features
in the framework and audio HAL.
The structures describe the objects needed to perform audio
routing and audio gain control: different variants of audio ports
and their corresponding configurations as well as gain controllers.
Change-Id: Iecd1b9186831067a52cc55619a63b7bba57dcbd9
2014-05-28 13:52:02 -07:00
Mike Lockwood
c8183af4b3
audio: Add AUDIO_DEVICE_IN_BLUETOOTH_A2DP
...
Change-Id: I32770abd42702d99f409f0968326041e78d1a826
2014-05-28 13:47:25 -07:00
Mark Salyzyn
f661a8f531
am 27348af6: am 6445b40e: am 811f2c0b: Merge "system/window.h: add deprecation warnings"
...
* commit '27348af683a55d8701567fdeabdd37b547b187f0':
system/window.h: add deprecation warnings
2014-05-28 19:33:51 +00:00
Mark Salyzyn
27348af683
am 6445b40e: am 811f2c0b: Merge "system/window.h: add deprecation warnings"
...
* commit '6445b40e93931dedcb831f38343c031c13b7ddb2':
system/window.h: add deprecation warnings
2014-05-28 19:31:06 +00:00
Mark Salyzyn
6445b40e93
am 811f2c0b: Merge "system/window.h: add deprecation warnings"
...
* commit '811f2c0b98d6f8935123221648c96ff975688902':
system/window.h: add deprecation warnings
2014-05-28 19:28:30 +00:00
Mark Salyzyn
811f2c0b98
Merge "system/window.h: add deprecation warnings"
2014-05-28 19:25:15 +00:00
Nick Kralevich
e7fd4078a2
am 7206eccb: am c4ffa5f6: am c290bed0: Merge "Remove dmesg_restrict"
...
* commit '7206eccbd904508a199c7ec302d7395b3b674968':
Remove dmesg_restrict
2014-05-28 18:02:27 +00:00
Torne (Richard Coles)
f9ff246dd7
am 4f3ad823: am a8329a36: am 96109cf3: Merge "Add UID and directory for RELRO sharing support."
...
* commit '4f3ad823eaf97fcbcbb1afac67371aff76677b1d':
Add UID and directory for RELRO sharing support.
2014-05-28 18:02:24 +00:00
Nick Kralevich
7206eccbd9
am c4ffa5f6: am c290bed0: Merge "Remove dmesg_restrict"
...
* commit 'c4ffa5f62ef256ff286122d0ceea61364aa67e13':
Remove dmesg_restrict
2014-05-28 13:14:54 +00:00
Nick Kralevich
c4ffa5f62e
am c290bed0: Merge "Remove dmesg_restrict"
...
* commit 'c290bed0350cded5620ed8dbb68b1cfb07d9828c':
Remove dmesg_restrict
2014-05-28 13:11:38 +00:00
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