Mathieu Chartier
b85c2494df
am 03b87b49
: Merge "Make host ashmem_create_region seed only once."
...
* commit '03b87b49fae82a6304ab69b10426701c4f82c7e9':
Make host ashmem_create_region seed only once.
2014-06-03 20:48:37 +00:00
Mathieu Chartier
03b87b49fa
Merge "Make host ashmem_create_region seed only once."
2014-06-03 19:02:35 +00:00
Mathieu Chartier
1104ae8cfc
Make host ashmem_create_region seed only once.
...
Not seeding this each call should help reduce collisions when multiple
threads are calling ashmem_create_region. Also cleaned up code by
deleting gotos, and making formatting consistent.
Bug: 15394258
Change-Id: Iafdaea57b2317e0eb7c40d7b5595c523814fd88c
2014-06-03 11:47:58 -07:00
Jean-Michel Trivi
76a77c7ade
Merge "Define audio attributes type in system audio header"
2014-06-03 17:40:47 +00:00
Mark Salyzyn
5f7189b68e
am a9fc6a52
: am b0b343d0
: Merge "liblog: test: Send bionc\'s fatal logging to the crash log"
...
* commit 'a9fc6a52b9d0f891b6cff3d9df92f89a81f8f002':
liblog: test: Send bionc's fatal logging to the crash log
2014-06-03 17:32:57 +00:00
Mark Salyzyn
a9fc6a52b9
am b0b343d0
: Merge "liblog: test: Send bionc\'s fatal logging to the crash log"
...
* commit 'b0b343d0864556816d89af61f7418130cea047d0':
liblog: test: Send bionc's fatal logging to the crash log
2014-06-03 17:29:32 +00:00
Mark Salyzyn
b0b343d086
Merge "liblog: test: Send bionc's fatal logging to the crash log"
2014-06-03 17:12:31 +00:00
Nick Kralevich
d69f6b6f7a
am 38fd5650
: am 82015d4f
: Merge "Only allow disabling SELinux on userdebug / eng builds"
...
* commit '38fd5650ea03b1f47ead2a12a655298ef2f70a91':
Only allow disabling SELinux on userdebug / eng builds
2014-06-03 16:43:10 +00:00
Nick Kralevich
38fd5650ea
am 82015d4f
: Merge "Only allow disabling SELinux on userdebug / eng builds"
...
* commit '82015d4f127219700992f8800118fd9c388e3c99':
Only allow disabling SELinux on userdebug / eng builds
2014-06-03 16:39:51 +00:00
Mark Salyzyn
90aa3d59a5
liblog: test: Send bionc's fatal logging to the crash log
...
Bug: 14159417
Change-Id: Ia2e29ce03d4e2b02919c62be091da37ce4082647
2014-06-03 09:29:11 -07:00
Nick Kralevich
82015d4f12
Merge "Only allow disabling SELinux on userdebug / eng builds"
2014-06-03 16:17:52 +00:00
Jean-Michel Trivi
0d580e83dd
Define audio attributes type in system audio header
...
Change-Id: Iac2030a1e4a6827676e6c5f9b408f1e768207f00
2014-06-03 15:47:17 +00:00
Narayan Kamath
8f4ac8e1d3
am 7cf8e1cb
: am 4e26c95a
: Merge "Skip the "--abi" flag on "adb install" if present."
...
* commit '7cf8e1cb88c44963ccb2128113d8a804d85645b9':
Skip the "--abi" flag on "adb install" if present.
2014-06-03 13:58:44 +00:00
Narayan Kamath
7cf8e1cb88
am 4e26c95a
: Merge "Skip the "--abi" flag on "adb install" if present."
...
* commit '4e26c95a6363da4885bb9178c9d42c273b357043':
Skip the "--abi" flag on "adb install" if present.
2014-06-03 13:29:03 +00:00
Narayan Kamath
4e26c95a63
Merge "Skip the "--abi" flag on "adb install" if present."
2014-06-03 09:58:24 +00:00
Nick Kralevich
f3c85b2488
Only allow disabling SELinux on userdebug / eng builds
...
Only parse and honor the kernel command line on userdebug
or eng builds. On user builds, assume that selinux is always enabled
and enforcing.
Change-Id: I71c66e4365bdf2f226800634126a38b716d96599
2014-06-02 20:56:04 -07:00
JP Abgrall
9e18975bac
am c99dd0c5
: am 676f7d50
: am fc85a7a8
: Merge "libcutils: fix rw FS remount check issue"
...
* commit 'c99dd0c58d2a7572740599f81b5a20ddb18dbf9e':
libcutils: fix rw FS remount check issue
2014-06-03 01:12:15 +00:00
JP Abgrall
c99dd0c58d
am 676f7d50
: am fc85a7a8
: Merge "libcutils: fix rw FS remount check issue"
...
* commit '676f7d509d683921335ccddc2f267a73eb5c60c6':
libcutils: fix rw FS remount check issue
2014-06-03 01:09:07 +00:00
JP Abgrall
676f7d509d
am fc85a7a8
: Merge "libcutils: fix rw FS remount check issue"
...
* commit 'fc85a7a848aa3e308b7b6d890e9f8e1476ba9ba7':
libcutils: fix rw FS remount check issue
2014-06-03 01:05:33 +00:00
JP Abgrall
fc85a7a848
Merge "libcutils: fix rw FS remount check issue"
2014-06-03 01:01:36 +00:00
Hong-Mei Li
88f7683d9c
libcutils: fix rw FS remount check issue
...
In some condition, some of FS would set disable_roll_forward option.
In this case, when we do power off or reboot, the power down progress
would stuck at android_reboot for 360 sec.
The reason is, remount_ro_done function check key word "rw" to determine
whether all the read-write FS has been remounted as read-only FS.
Unfortunately, it takes disable_roll_forward as a rw flag too by
mistake, so the check would always fail, until reach 360 sec threshold.
The patch would match "rw," from mount options, this can avoid the issue
successfully.
Change-Id: I409f9dc88c9ee5cf049615ea9dcccaf195b6bc5a
Signed-off-by: Hong-Mei Li <a21834@motorola.com>
2014-06-02 22:45:37 -07:00
Mark Salyzyn
5bed803664
libutils: turn on -Werror
...
- Deal with some -Wunused issues
- Override PRI macros (windows)
- Revert use of PRI macros on off64_t (linux)
- Deal with a gnu++11 complaince issue
Change-Id: Ie66751293bd84477a5a6dfd8a57e700a16e36964
2014-06-02 15:57:50 -07:00
Dave Allison
b311ca9ee8
Add LD_PRELOAD for libsigchain.so to the environment
...
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
2014-06-02 15:54:28 -07:00
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