Mark Salyzyn
4b41092a5d
am 5ce10c4d: am 00d70979: am bf0f2590: Merge "liblog: cache getuid() syscall"
...
* commit '5ce10c4d2415f25a4d2bfbf49c50bb152dff0fa2':
liblog: cache getuid() syscall
2014-06-02 20:18:09 +00:00
Mark Salyzyn
5ce10c4d24
am 00d70979: am bf0f2590: Merge "liblog: cache getuid() syscall"
...
* commit '00d70979632fb72a7837206476505af3a030f782':
liblog: cache getuid() syscall
2014-06-02 20:15:26 +00:00
Mark Salyzyn
00d7097963
am bf0f2590: Merge "liblog: cache getuid() syscall"
...
* commit 'bf0f25905b12581f05b65b1ebe95211c727ae483':
liblog: cache getuid() syscall
2014-06-02 20:11:56 +00:00
Mark Salyzyn
bf0f25905b
Merge "liblog: cache getuid() syscall"
2014-06-02 20:09:19 +00:00
Mark Salyzyn
076ba81ce9
liblog: cache getuid() syscall
...
BUG: 15315766
Change-Id: I8f889a1c6ede74f2621f1b8ea5fda666c4b9cba2
2014-06-02 12:33:57 -07:00
Jeff Sharkey
b81708146f
Merge "Add "exec" service: shell commands with no pty."
2014-06-02 16:54:23 +00:00
Nick Kralevich
ab1816a6c0
am 4f04439f: am 6fb92bd8: am 252b0e2b: Merge "SELinux changes to check policy versions during a reload."
...
* commit '4f04439f0eab481d1b7938e78d8ee316dda4d641':
SELinux changes to check policy versions during a reload.
2014-05-31 11:38:44 +00:00
Nick Kralevich
4f04439f0e
am 6fb92bd8: am 252b0e2b: Merge "SELinux changes to check policy versions during a reload."
...
* commit '6fb92bd84bea3c5efadd891f1853fef7c811e79d':
SELinux changes to check policy versions during a reload.
2014-05-31 08:49:31 +00:00
Nick Kralevich
6fb92bd84b
am 252b0e2b: Merge "SELinux changes to check policy versions during a reload."
...
* commit '252b0e2b46e3d5e71a8b5c55928dc9ca62811f0a':
SELinux changes to check policy versions during a reload.
2014-05-31 05:05:52 +00:00
Nick Kralevich
252b0e2b46
Merge "SELinux changes to check policy versions during a reload."
2014-05-31 05:03:05 +00:00
Jeff Sharkey
40f321ab49
am 2e7d80d1: Per-app media directories on external storage.
...
* commit '2e7d80d10acf95076dfb1f2727455432091de65f':
Per-app media directories on external storage.
2014-05-30 23:48:00 +00:00
Jeff Sharkey
2e7d80d10a
Per-app media directories on external storage.
...
This change defines per-app directories on external storage that
will be scanned and included in MediaStore. This gives apps a way
to write content to secondary shared storage in a way that can
easily be surfaced to other apps.
Bug: 14382377
Change-Id: I6f03d8076a9391d8b9eb8421ec3fc93669b3ba0d
2014-05-30 16:28:49 -07:00
Dan Albert
70b53c4057
am 4b126c46: am e8f90ca6: am 570cd46d: Merge "Revert "Move libutils to libc++""
...
* commit '4b126c4604965ea029d9c741d074ad7f820b5269':
Revert "Move libutils to libc++"
2014-05-30 20:24:07 +00:00
Dan Albert
4b126c4604
am e8f90ca6: am 570cd46d: Merge "Revert "Move libutils to libc++""
...
* commit 'e8f90ca60d65f5a0542b77f8f517c4fb80da2e52':
Revert "Move libutils to libc++"
2014-05-30 20:21:03 +00:00
Dan Albert
e8f90ca60d
am 570cd46d: Merge "Revert "Move libutils to libc++""
...
* commit '570cd46d14645f622e9972671308fdb4f2425292':
Revert "Move libutils to libc++"
2014-05-30 20:17:32 +00:00
Dan Albert
570cd46d14
Merge "Revert "Move libutils to libc++""
2014-05-30 20:13:48 +00:00
Dan Albert
7bc49a16e8
Revert "Move libutils to libc++"
...
Causes issues in the unbundled branches.
This reverts commit dc133729b0
.
Change-Id: I9185ce9ea9e0ea631f0bfe016edf38c6830b288a
2014-05-30 19:40:58 +00:00
Dan Albert
6f8030c565
am 58f4a09b: am 36f536fc: am 9f69e028: Merge "Move libutils to libc++"
...
* commit '58f4a09bb4375c2f7b85ec14449a0588e85e126a':
Move libutils to libc++
2014-05-30 19:01:45 +00:00
Dan Albert
58f4a09bb4
am 36f536fc: am 9f69e028: Merge "Move libutils to libc++"
...
* commit '36f536fc7b88fe21a974bce6fed565bc622b5bc2':
Move libutils to libc++
2014-05-30 18:43:01 +00:00
Dan Albert
36f536fc7b
am 9f69e028: Merge "Move libutils to libc++"
...
* commit '9f69e028f73ce3e3ebbbc795d9a0b1143acb15e6':
Move libutils to libc++
2014-05-30 18:40:25 +00:00
Dan Albert
9f69e028f7
Merge "Move libutils to libc++"
2014-05-30 18:32:08 +00:00
Jeff Sharkey
5d9d434efa
Add "exec" service: shell commands with no pty.
...
To facilitate device scripts that want to read/write binary data from
the host side, this change introduces a new "exec" service that
behaves like "shell" but without creating a pty, which would otherwise
mangle binary data.
After forking, it hooks up stdin/stdout of the child process to
the socket connected through to the host. The adb transport doesn't
support shutdown(), so the host can't half-close the socket and wait
for device termination. Instead, the host side now has two explicit
commands "exec-in" and "exec-out" for either sending or receiving
data.
Teach host side copy_to_file() to deal with stdin/stdout special
cases. Switch device side backup/restore services to use the new
create_subproc_raw under the hood.
Change-Id: I5993049803519d3959761f2363037b02c50920ee
2014-05-30 11:27:56 -07:00
Mark Salyzyn
3051ddd13a
am 4547273b: am 265262a8: am 5f815da3: Merge "String16.cpp rm unused utils/Debug.h"
...
* commit '4547273b427422d69260a21dd19b1480aff7b890':
String16.cpp rm unused utils/Debug.h
2014-05-29 23:56:57 +00:00
Mark Salyzyn
4547273b42
am 265262a8: am 5f815da3: Merge "String16.cpp rm unused utils/Debug.h"
...
* commit '265262a8b243faa16c268ac40801a226359437a6':
String16.cpp rm unused utils/Debug.h
2014-05-29 23:54:30 +00:00
Mark Salyzyn
265262a8b2
am 5f815da3: Merge "String16.cpp rm unused utils/Debug.h"
...
* commit '5f815da3aba73e7605b72b6b3e2de648ca7c3390':
String16.cpp rm unused utils/Debug.h
2014-05-29 23:52:54 +00:00
Mark Salyzyn
5f815da3ab
Merge "String16.cpp rm unused utils/Debug.h"
2014-05-29 23:51:17 +00:00
Dave Allison
664bdde0f1
am 01546ff2: am dec41a38: am 967729b7: Merge "Add LD_PRELOAD for libsigchain.so to the environment"
...
* commit '01546ff208cec5ac15f81cc84f507fb8c9a51d98':
Add LD_PRELOAD for libsigchain.so to the environment
2014-05-29 21:10:00 +00:00
Dave Allison
01546ff208
am dec41a38: am 967729b7: Merge "Add LD_PRELOAD for libsigchain.so to the environment"
...
* commit 'dec41a388d58ae515c83df4ec084c1e38edb427a':
Add LD_PRELOAD for libsigchain.so to the environment
2014-05-29 21:06:24 +00:00
Mark Salyzyn
6443033f6d
String16.cpp rm unused utils/Debug.h
...
Change-Id: Ie7e3695770f20be33738a0f0a868cc914248d91a
2014-05-29 13:14:35 -07:00
Dave Allison
dec41a388d
am 967729b7: Merge "Add LD_PRELOAD for libsigchain.so to the environment"
...
* commit '967729b7ca675d6f2c895a1bd56216a62b217e50':
Add LD_PRELOAD for libsigchain.so to the environment
2014-05-29 19:57:50 +00:00
Dave Allison
967729b7ca
Merge "Add LD_PRELOAD for libsigchain.so to the environment"
2014-05-29 19:51:42 +00:00
Dan Albert
dc133729b0
Move libutils to libc++
...
Bug: 15193147
Change-Id: Ib4b1835e77279db905e098abc7c9bf8d27d66b57
2014-05-29 10:19:39 -07:00
Narayan Kamath
a284f8b214
Skip the "--abi" flag on "adb install" if present.
...
This flag needs to be passed through to the package manager.
Without this change, the argument to this flag is interpreted
as a filename.
NOTE: If we don't want to add special treatment for this flag,
we'll have to assume that all flags with a -- prefix have an
argument, and that isn't necessarily true.
Change-Id: I78c3fa842bc24148d83d7278e6dee395686240a0
2014-05-29 15:54:10 +01:00
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