summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* toolbox: Fix rm -f with multiple filesBenoit Goby2013-03-251-2/+2
| | | | | | | Only check errno if unlink returns -1. Continue instead of exiting if one file does not exist. Change-Id: Iaf01b8523b84e87fcb0d732b89b7be6e24279c0b
* am 40d313b4: am 6b5de1cd: init.rc: Set owner/perm for interactive governor ↵Todd Poynor2013-03-251-0/+2
|\ | | | | | | | | | | | | io_is_busy * commit '40d313b49341973f4a188647e0e923a683346ddf': init.rc: Set owner/perm for interactive governor io_is_busy
| * am 6b5de1cd: init.rc: Set owner/perm for interactive governor io_is_busyTodd Poynor2013-03-251-0/+2
| |\ | | | | | | | | | | | | * commit '6b5de1cda2e5c4946aa08a11a38ad0a7eee115ce': init.rc: Set owner/perm for interactive governor io_is_busy
| | * init.rc: Set owner/perm for interactive governor io_is_busyTodd Poynor2013-03-251-0/+2
| | | | | | | | | | | | Change-Id: I7537d56a23ca787daf92a9d91778056f987097bd
* | | am 746cde9a: am fb39c0d1: am 4d71493e: am e849970c: Merge "Fix mode on ↵Geremy Condra2013-03-231-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | /data/security." * commit '746cde9a8c92a138f7a53b17728ecff5c48c9e4b': Fix mode on /data/security.
| * | am fb39c0d1: am 4d71493e: am e849970c: Merge "Fix mode on /data/security."Geremy Condra2013-03-231-1/+1
| |\ \ | | |/ | | | | | | | | | * commit 'fb39c0d19860fe48bc598d5d180a8cce9f59e33b': Fix mode on /data/security.
| | * am 4d71493e: am e849970c: Merge "Fix mode on /data/security."Geremy Condra2013-03-221-1/+1
| | |\ | | | | | | | | | | | | | | | | * commit '4d71493e74ed1ea39e554146351cc39e47cb5d02': Fix mode on /data/security.
| | | * am e849970c: Merge "Fix mode on /data/security."Geremy Condra2013-03-221-1/+1
| | | |\ | | | | | | | | | | | | | | | | | | | | * commit 'e849970c5423cae43da1f7e2ab117117db6e0a64': Fix mode on /data/security.
| | | | * Merge "Fix mode on /data/security."Geremy Condra2013-03-231-1/+1
| | | | |\
| | | | | * Fix mode on /data/security.Stephen Smalley2013-03-211-1/+1
| | | | |/ | | | | | | | | | | | | | | | | | | | | Change-Id: Id97d06a1c360c7871361db147f76b8a2eaceca42 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | | | | am 85da9313: am d0f3e858: Merge "android_filesystem_config: add /vendor" ↵Ying Wang2013-03-221-0/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr2-dev * commit '85da931345fd420bc2959d79361058efa974f465': android_filesystem_config: add /vendor
| * | | | am d0f3e858: Merge "android_filesystem_config: add /vendor" into jb-mr2-devYing Wang2013-03-221-0/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'd0f3e8588a58e1687ca4336609e809351e94e2d8': android_filesystem_config: add /vendor
| | * | | Merge "android_filesystem_config: add /vendor" into jb-mr2-devYing Wang2013-03-221-0/+2
| | |\ \ \
| | | * | | android_filesystem_config: add /vendorColin Cross2013-03-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make /vendor have the same permissions as /system/vendor for devices that have a vendor partition. Bug: 8341435 Change-Id: I077a2caf9da41fc072a4d3e334be28c24b70c7cd
* | | | | | am 9cb78cc3: am af3a9cad: Merge "liblogwrap: use POLLHUP flag to check when ↵Rom Lemarchand2013-03-211-102/+49
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a child dies" into jb-mr2-dev * commit '9cb78cc3e1207544c6839ff3f78d266ae408a84b': liblogwrap: use POLLHUP flag to check when a child dies
| * | | | | am af3a9cad: Merge "liblogwrap: use POLLHUP flag to check when a child dies" ↵Rom Lemarchand2013-03-211-102/+49
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr2-dev * commit 'af3a9cad81f35ca2a88be76e46cefb2882e531d2': liblogwrap: use POLLHUP flag to check when a child dies
| | * | | | Merge "liblogwrap: use POLLHUP flag to check when a child dies" into jb-mr2-devRom Lemarchand2013-03-211-102/+49
| | |\ \ \ \
| | | * | | | liblogwrap: use POLLHUP flag to check when a child diesRom Lemarchand2013-03-201-102/+49
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the old signal handling mechanism with a check of POLLHUP to check when the child has died. See http://b/8333626 Change-Id: Ic9909b6660b1c3d1ed3015568b1a1ee1c25afe20
* | | | | | am 9e5a4c56: am 9feea559: Merge "Create a new location for /data policy ↵Geremy Condra2013-03-212-0/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files" into jb-mr2-dev * commit '9e5a4c56958fadc2f31dcf762dd647791eaa14e4': Create a new location for /data policy files
| * | | | | am 9feea559: Merge "Create a new location for /data policy files" into ↵Geremy Condra2013-03-212-0/+4
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit '9feea559d68559dd74eaf325318014dee33ef9ea': Create a new location for /data policy files
| | * | | | Merge "Create a new location for /data policy files" into jb-mr2-devGeremy Condra2013-03-212-0/+4
| | |\ \ \ \
| | | * | | | Create a new location for /data policy filesWilliam Roberts2013-03-212-0/+4
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding a new location for policy files under /data, the new location is /data/security. The new location is used before attempting to use any other location. This requires a new directory to be created by the init script and an update to the location of the property_contexts file for property service. Change-Id: I955a722ac3e51fa6c1b97201b8bdef3f601cf09d
* | | | | | am da204c5c: am 62980e81: Inline ldrex/strex for thumb2, remove ARMv5 remnants.Ian Rogers2013-03-211-123/+33
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'da204c5c4244ea67aacbd29c222d0a2d1c35b443': Inline ldrex/strex for thumb2, remove ARMv5 remnants.
| * | | | | am 62980e81: Inline ldrex/strex for thumb2, remove ARMv5 remnants.Ian Rogers2013-03-211-123/+33
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '62980e817c51c56208971ed5c3e98e0cb21e1685': Inline ldrex/strex for thumb2, remove ARMv5 remnants.
| | * | | | Inline ldrex/strex for thumb2, remove ARMv5 remnants.Ian Rogers2013-03-211-123/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We assume ARMv7 which with thumb2 has ldrex/strex operations that may be inlined if -mthumb is defined. Remove remnants of ARMv5 support. (cherry picked from commit 80c3b278fde7b92504614b7d47b9fecf6f736081) Change-Id: I194a3d08e933c63f79d48288d9235b4e64099340
* | | | | | am 6ed65d5e: am 033b7f24: am a3c3709e: (-s ours) am 028e38f6: Merge "Create ↵Geremy Condra2013-03-210-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a new location for /data policy files" * commit '6ed65d5e7f4d98de5bea34e71c33abd5a7be9b32': Create a new location for /data policy files
| * | | | | am 033b7f24: am a3c3709e: (-s ours) am 028e38f6: Merge "Create a new ↵Geremy Condra2013-03-210-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | location for /data policy files" * commit '033b7f244655af0e638aa608bb868237ec0282e4': Create a new location for /data policy files
| | * | | | am a3c3709e: (-s ours) am 028e38f6: Merge "Create a new location for /data ↵Geremy Condra2013-03-210-0/+0
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ / | | | | | | | | | | | | | | | policy files" * commit 'a3c3709ead0505f1c872bbf3a42999deb727e2ff': Create a new location for /data policy files
| | | * | am 028e38f6: Merge "Create a new location for /data policy files"Geremy Condra2013-03-202-0/+4
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | * commit '028e38f691c12c3f6f034dd192e5efcae8e767c7': Create a new location for /data policy files
| | | | * Merge "Create a new location for /data policy files"Geremy Condra2013-03-212-0/+4
| | | | |\
| | | | | * Create a new location for /data policy filesWilliam Roberts2013-03-202-0/+4
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding a new location for policy files under /data, the new location is /data/security. The new location is used before attempting to use any other location. This requires a new directory to be created by the init script and an update to the location of the property_contexts file for property service. Change-Id: I955a722ac3e51fa6c1b97201b8bdef3f601cf09d
* | | | | am 127013c1: am 7bce39ca: am 2690482a: am 55e1df47: Merge "debuggerd: Fix ↵Elliott Hughes2013-03-201-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | minor memory leak" * commit '127013c1627b75a24610b66dda01de9a91446789': debuggerd: Fix minor memory leak
| * | | | am 7bce39ca: am 2690482a: am 55e1df47: Merge "debuggerd: Fix minor memory leak"Elliott Hughes2013-03-201-0/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '7bce39cac65166f39d0f26453da6e59e236d2ab5': debuggerd: Fix minor memory leak
| | * | | am 2690482a: am 55e1df47: Merge "debuggerd: Fix minor memory leak"Elliott Hughes2013-03-201-0/+1
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '2690482a35562fc2f5c8a2164f10ffba1d27e599': debuggerd: Fix minor memory leak
| | | * | am 55e1df47: Merge "debuggerd: Fix minor memory leak"Elliott Hughes2013-03-201-0/+1
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | * commit '55e1df471bb6e786c46a64d7ea99e224a6c46af2': debuggerd: Fix minor memory leak
| | | | * Merge "debuggerd: Fix minor memory leak"Elliott Hughes2013-03-201-0/+1
| | | | |\
| | | | | * debuggerd: Fix minor memory leakLiangtao Gao2013-03-201-0/+1
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | free_ptrace_context(context) doesn't free(context), which leaks the memory allocated to context. Change-Id: Ic199b257aefc9a05ec2d902958efa8a57a601fb1 Signed-off-by: Liangtao Gao <gliangtao@gmail.com>
* | | | | am 3c7eb2a2: (-s ours) Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-03-200-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | * commit '3c7eb2a2ba1f97814d39c23e6dea0afa7ff92240':
| * | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-03-200-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I12e6984817c915f51a7297a950a47b79de036679
| | * \ \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-03-190-0/+0
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-03-180-0/+0
| | | |\ \ \
| | | | * \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-03-130-0/+0
| | | | |\ \ \
* | | | | \ \ \ am ee2dccf2: am 66317770: cutils: trace: add asynchronous eventsAlex Ray2013-03-191-0/+41
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ee2dccf21b61094a0fd782d32f221804b0a7d3fa': cutils: trace: add asynchronous events
| * | | | | | | am 66317770: cutils: trace: add asynchronous eventsAlex Ray2013-03-191-0/+41
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '66317770d37c012b12609defdc750304c97bd8d3': cutils: trace: add asynchronous events
| | * | | | | | cutils: trace: add asynchronous eventsAlex Ray2013-03-181-0/+41
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia09d34cbc6c8c85fb3d0f1a7e95de53d1b79e998
* | | | | | | am c99742b5: am db3eb684: am e657e0c2: am 1a2bdd6f: Merge "liblog: fix fd ↵Nick Kralevich2013-03-151-1/+3
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | leakage" * commit 'c99742b54e483ce0806ef1f1d3580b50d8e2d166': liblog: fix fd leakage
| * | | | | | am db3eb684: am e657e0c2: am 1a2bdd6f: Merge "liblog: fix fd leakage"Nick Kralevich2013-03-151-1/+3
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'db3eb6844c361acff2a0f78325d8227695bb40b5': liblog: fix fd leakage
| | * | | | | am e657e0c2: am 1a2bdd6f: Merge "liblog: fix fd leakage"Nick Kralevich2013-03-151-1/+3
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | * commit 'e657e0c2a4a30104c650e7ad8827e8e887af0cb9': liblog: fix fd leakage
| | | * | | | am 1a2bdd6f: Merge "liblog: fix fd leakage"Nick Kralevich2013-03-151-1/+3
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | | | | | | | | | | | | | | * commit '1a2bdd6fbef8119e05be703658ef7fa2017ecf6e': liblog: fix fd leakage
| | | | * | | Merge "liblog: fix fd leakage"Nick Kralevich2013-03-151-1/+3
| | | | |\ \ \
generated by cgit v1.1 at 2025-01-13 10:22:16 +0000