summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | am 0d31d487: am d3b61d18: Merge "Clean up the debuggerd makefile."Elliott Hughes2014-06-041-16/+15
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | / / / / / | |_|_|_|/ / / / / |/| | | | | | | | * commit '0d31d4877ca451c9e15a0651ab2b4827556afeff': Clean up the debuggerd makefile.
| * | | | | | | | am d3b61d18: Merge "Clean up the debuggerd makefile."Elliott Hughes2014-06-031-16/+15
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd3b61d184ecffc4ac69e8573fcb00cc295a0d550': Clean up the debuggerd makefile.
| | * | | | | | | Merge "Clean up the debuggerd makefile."Elliott Hughes2014-06-031-16/+15
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Clean up the debuggerd makefile.Elliott Hughes2014-06-031-16/+15
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In particular, turn on -Wunused, which is globally off by default thanks to build/core/config.mk. Change-Id: Iba3ee1c0726f43eced972a53959f0e1cd97190c9
* | | | | | | | am b85c2494: am 03b87b49: Merge "Make host ashmem_create_region seed only once."Mathieu Chartier2014-06-031-61/+63
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b85c2494df1e1003b3101e36b29faace3a51dc3f': Make host ashmem_create_region seed only once.
| * | | | | | | am 03b87b49: Merge "Make host ashmem_create_region seed only once."Mathieu Chartier2014-06-031-61/+63
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '03b87b49fae82a6304ab69b10426701c4f82c7e9': Make host ashmem_create_region seed only once.
| | * | | | | | Merge "Make host ashmem_create_region seed only once."Mathieu Chartier2014-06-031-61/+63
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | | * | | | | Make host ashmem_create_region seed only once.Mathieu Chartier2014-06-031-61/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | Merge "Define audio attributes type in system audio header"Jean-Michel Trivi2014-06-031-0/+59
|\ \ \ \ \ \ \ \
| * | | | | | | | Define audio attributes type in system audio headerJean-Michel Trivi2014-06-031-0/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iac2030a1e4a6827676e6c5f9b408f1e768207f00
* | | | | | | | | am a9fc6a52: am b0b343d0: Merge "liblog: test: Send bionc\'s fatal logging ↵Mark Salyzyn2014-06-031-2/+2
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to the crash log" * commit 'a9fc6a52b9d0f891b6cff3d9df92f89a81f8f002': liblog: test: Send bionc's fatal logging to the crash log
| * | | | | | | | am b0b343d0: Merge "liblog: test: Send bionc\'s fatal logging to the crash log"Mark Salyzyn2014-06-031-2/+2
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit 'b0b343d0864556816d89af61f7418130cea047d0': liblog: test: Send bionc's fatal logging to the crash log
| | * | | | | | | Merge "liblog: test: Send bionc's fatal logging to the crash log"Mark Salyzyn2014-06-031-2/+2
| | |\ \ \ \ \ \ \
| | | * | | | | | | liblog: test: Send bionc's fatal logging to the crash logMark Salyzyn2014-06-031-2/+2
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14159417 Change-Id: Ia2e29ce03d4e2b02919c62be091da37ce4082647
* | | | | | | | | am 38fd5650: am 82015d4f: Merge "Only allow disabling SELinux on userdebug / ↵Nick Kralevich2014-06-032-1/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | / / / / / / | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | eng builds" * commit '38fd5650ea03b1f47ead2a12a655298ef2f70a91': Only allow disabling SELinux on userdebug / eng builds
| * | | | | | | am 82015d4f: Merge "Only allow disabling SELinux on userdebug / eng builds"Nick Kralevich2014-06-032-1/+5
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '82015d4f127219700992f8800118fd9c388e3c99': Only allow disabling SELinux on userdebug / eng builds
| | * | | | | | Merge "Only allow disabling SELinux on userdebug / eng builds"Nick Kralevich2014-06-032-1/+5
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | * | | | | Only allow disabling SELinux on userdebug / eng buildsNick Kralevich2014-06-022-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | am 7cf8e1cb: am 4e26c95a: Merge "Skip the "--abi" flag on "adb install" if ↵Narayan Kamath2014-06-031-0/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | present." * commit '7cf8e1cb88c44963ccb2128113d8a804d85645b9': Skip the "--abi" flag on "adb install" if present.
| * | | | | | | am 4e26c95a: Merge "Skip the "--abi" flag on "adb install" if present."Narayan Kamath2014-06-031-0/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '4e26c95a6363da4885bb9178c9d42c273b357043': Skip the "--abi" flag on "adb install" if present.
| | * | | | | | Merge "Skip the "--abi" flag on "adb install" if present."Narayan Kamath2014-06-031-0/+2
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Skip the "--abi" flag on "adb install" if present.Narayan Kamath2014-05-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | am c99dd0c5: am 676f7d50: am fc85a7a8: Merge "libcutils: fix rw FS remount ↵JP Abgrall2014-06-031-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check issue" * commit 'c99dd0c58d2a7572740599f81b5a20ddb18dbf9e': libcutils: fix rw FS remount check issue
| * | | | | | | am 676f7d50: am fc85a7a8: Merge "libcutils: fix rw FS remount check issue"JP Abgrall2014-06-031-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '676f7d509d683921335ccddc2f267a73eb5c60c6': libcutils: fix rw FS remount check issue
| | * | | | | | am fc85a7a8: Merge "libcutils: fix rw FS remount check issue"JP Abgrall2014-06-031-1/+1
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fc85a7a848aa3e308b7b6d890e9f8e1476ba9ba7': libcutils: fix rw FS remount check issue
| | | * \ \ \ \ \ Merge "libcutils: fix rw FS remount check issue"JP Abgrall2014-06-031-1/+1
| | | |\ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| | | | * | | | | libcutils: fix rw FS remount check issueHong-Mei Li2014-06-021-1/+1
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | | am 5ce10c4d: am 00d70979: am bf0f2590: Merge "liblog: cache getuid() syscall"Mark Salyzyn2014-06-021-7/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '5ce10c4d2415f25a4d2bfbf49c50bb152dff0fa2': liblog: cache getuid() syscall
| * | | | | | | am 00d70979: am bf0f2590: Merge "liblog: cache getuid() syscall"Mark Salyzyn2014-06-021-7/+10
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '00d70979632fb72a7837206476505af3a030f782': liblog: cache getuid() syscall
| | * | | | | | am bf0f2590: Merge "liblog: cache getuid() syscall"Mark Salyzyn2014-06-021-7/+10
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bf0f25905b12581f05b65b1ebe95211c727ae483': liblog: cache getuid() syscall
| | | * | | | | Merge "liblog: cache getuid() syscall"Mark Salyzyn2014-06-021-7/+10
| | | |\ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | | * | | | liblog: cache getuid() syscallMark Salyzyn2014-06-021-7/+10
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 15315766 Change-Id: I8f889a1c6ede74f2621f1b8ea5fda666c4b9cba2
* | | | | | | Merge "Add "exec" service: shell commands with no pty."Jeff Sharkey2014-06-025-218/+171
|\ \ \ \ \ \ \
| * | | | | | | Add "exec" service: shell commands with no pty.Jeff Sharkey2014-05-305-218/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | am 4f04439f: am 6fb92bd8: am 252b0e2b: Merge "SELinux changes to check ↵Nick Kralevich2014-05-311-8/+5
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | policy versions during a reload." * commit '4f04439f0eab481d1b7938e78d8ee316dda4d641': SELinux changes to check policy versions during a reload.
| * | | | | | | am 6fb92bd8: am 252b0e2b: Merge "SELinux changes to check policy versions ↵Nick Kralevich2014-05-311-8/+5
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | during a reload." * commit '6fb92bd84bea3c5efadd891f1853fef7c811e79d': SELinux changes to check policy versions during a reload.
| | * | | | | | am 252b0e2b: Merge "SELinux changes to check policy versions during a reload."Nick Kralevich2014-05-311-8/+5
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | * commit '252b0e2b46e3d5e71a8b5c55928dc9ca62811f0a': SELinux changes to check policy versions during a reload.
| | | * | | | | Merge "SELinux changes to check policy versions during a reload."Nick Kralevich2014-05-311-8/+5
| | | |\ \ \ \ \
| | | | * | | | | SELinux changes to check policy versions during a reload.Robert Craig2014-04-281-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When deciding on which property_contexts policy to load during a reload, an initial call is made to libselinux to grab the correct policy index. This policy index represents whether the /data/security or the rootfs version will be used. Change-Id: I4716039bb0f5ba1e961977a18350347a67969dca Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
* | | | | | | | | am 2e7d80d1: Per-app media directories on external storage.Jeff Sharkey2014-05-301-0/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2e7d80d10acf95076dfb1f2727455432091de65f': Per-app media directories on external storage.
| * | | | | | | | | Per-app media directories on external storage.Jeff Sharkey2014-05-301-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | am 4b126c46: am e8f90ca6: am 570cd46d: Merge "Revert "Move libutils to libc++""Dan Albert2014-05-302-4/+9
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4b126c4604965ea029d9c741d074ad7f820b5269': Revert "Move libutils to libc++"
| * | | | | | | | | am e8f90ca6: am 570cd46d: Merge "Revert "Move libutils to libc++""Dan Albert2014-05-302-4/+9
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e8f90ca60d65f5a0542b77f8f517c4fb80da2e52': Revert "Move libutils to libc++"
| | * | | | | | | | am 570cd46d: Merge "Revert "Move libutils to libc++""Dan Albert2014-05-302-4/+9
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * commit '570cd46d14645f622e9972671308fdb4f2425292': Revert "Move libutils to libc++"
| | | * | | | | | | Merge "Revert "Move libutils to libc++""Dan Albert2014-05-302-4/+9
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Revert "Move libutils to libc++"Dan Albert2014-05-302-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Causes issues in the unbundled branches. This reverts commit dc133729b0bc983c6ecfecdb06ac8b433ea31350. Change-Id: I9185ce9ea9e0ea631f0bfe016edf38c6830b288a
* | | | | | | | | | | am 58f4a09b: am 36f536fc: am 9f69e028: Merge "Move libutils to libc++"Dan Albert2014-05-302-9/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '58f4a09bb4375c2f7b85ec14449a0588e85e126a': Move libutils to libc++
| * | | | | | | | | | am 36f536fc: am 9f69e028: Merge "Move libutils to libc++"Dan Albert2014-05-302-9/+4
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '36f536fc7b88fe21a974bce6fed565bc622b5bc2': Move libutils to libc++
| | * | | | | | | | | am 9f69e028: Merge "Move libutils to libc++"Dan Albert2014-05-302-9/+4
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9f69e028f73ce3e3ebbbc795d9a0b1143acb15e6': Move libutils to libc++
| | | * | | | | | | | Merge "Move libutils to libc++"Dan Albert2014-05-302-9/+4
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / /