Commit Graph

5593 Commits

Author SHA1 Message Date
Todd Poynor d15715e5a0 am 40d313b4: am 6b5de1cd: init.rc: Set owner/perm for interactive governor io_is_busy
* commit '40d313b49341973f4a188647e0e923a683346ddf':
  init.rc: Set owner/perm for interactive governor io_is_busy
2013-03-25 22:58:36 +00:00
Todd Poynor 40d313b493 am 6b5de1cd: init.rc: Set owner/perm for interactive governor io_is_busy
* commit '6b5de1cda2e5c4946aa08a11a38ad0a7eee115ce':
  init.rc: Set owner/perm for interactive governor io_is_busy
2013-03-25 22:55:57 +00:00
Ziv Hendel f75ea8d082 Properly handle cases of multiple inotify events
Bug: 8469799
Change-Id: Ie10242dd05becd142cc84651d5e5795e4c02270d
Signed-off-by: Igor Murashkin <iam@google.com>
Signed-off-by: Adam Hampson <ahampson@google.com>
2013-03-25 14:12:18 -07:00
Todd Poynor 6b5de1cda2 init.rc: Set owner/perm for interactive governor io_is_busy
Change-Id: I7537d56a23ca787daf92a9d91778056f987097bd
2013-03-25 13:17:13 -07:00
The Android Automerger a797007bc1 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-25 05:57:00 -07:00
Geremy Condra a4d79d68ac am 746cde9a: am fb39c0d1: am 4d71493e: am e849970c: Merge "Fix mode on /data/security."
* commit '746cde9a8c92a138f7a53b17728ecff5c48c9e4b':
  Fix mode on /data/security.
2013-03-23 03:59:27 +00:00
Geremy Condra 746cde9a8c am fb39c0d1: am 4d71493e: am e849970c: Merge "Fix mode on /data/security."
* commit 'fb39c0d19860fe48bc598d5d180a8cce9f59e33b':
  Fix mode on /data/security.
2013-03-23 03:56:40 +00:00
Geremy Condra fb39c0d198 am 4d71493e: am e849970c: Merge "Fix mode on /data/security."
* commit '4d71493e74ed1ea39e554146351cc39e47cb5d02':
  Fix mode on /data/security.
2013-03-22 20:54:52 -07:00
Geremy Condra 4d71493e74 am e849970c: Merge "Fix mode on /data/security."
* commit 'e849970c5423cae43da1f7e2ab117117db6e0a64':
  Fix mode on /data/security.
2013-03-22 20:52:37 -07:00
Geremy Condra e849970c54 Merge "Fix mode on /data/security." 2013-03-23 02:47:16 +00:00
Ying Wang 504d2747bd am 85da9313: am d0f3e858: Merge "android_filesystem_config: add /vendor" into jb-mr2-dev
* commit '85da931345fd420bc2959d79361058efa974f465':
  android_filesystem_config: add /vendor
2013-03-22 16:01:42 +00:00
Ying Wang 85da931345 am d0f3e858: Merge "android_filesystem_config: add /vendor" into jb-mr2-dev
* commit 'd0f3e8588a58e1687ca4336609e809351e94e2d8':
  android_filesystem_config: add /vendor
2013-03-22 15:59:31 +00:00
Ying Wang d0f3e8588a Merge "android_filesystem_config: add /vendor" into jb-mr2-dev 2013-03-22 15:57:59 +00:00
Rom Lemarchand dcf8b21eef am 9cb78cc3: am af3a9cad: Merge "liblogwrap: use POLLHUP flag to check when a child dies" into jb-mr2-dev
* commit '9cb78cc3e1207544c6839ff3f78d266ae408a84b':
  liblogwrap: use POLLHUP flag to check when a child dies
2013-03-21 23:18:54 +00:00
Rom Lemarchand 9cb78cc3e1 am af3a9cad: Merge "liblogwrap: use POLLHUP flag to check when a child dies" into jb-mr2-dev
* commit 'af3a9cad81f35ca2a88be76e46cefb2882e531d2':
  liblogwrap: use POLLHUP flag to check when a child dies
2013-03-21 23:16:56 +00:00
Rom Lemarchand af3a9cad81 Merge "liblogwrap: use POLLHUP flag to check when a child dies" into jb-mr2-dev 2013-03-21 23:15:36 +00:00
Geremy Condra 3676ea2007 am 9e5a4c56: am 9feea559: Merge "Create a new location for /data policy files" into jb-mr2-dev
* commit '9e5a4c56958fadc2f31dcf762dd647791eaa14e4':
  Create a new location for /data policy files
2013-03-21 21:49:25 +00:00
Geremy Condra 9e5a4c5695 am 9feea559: Merge "Create a new location for /data policy files" into jb-mr2-dev
* commit '9feea559d68559dd74eaf325318014dee33ef9ea':
  Create a new location for /data policy files
2013-03-21 21:47:48 +00:00
Geremy Condra 9feea559d6 Merge "Create a new location for /data policy files" into jb-mr2-dev 2013-03-21 21:45:39 +00:00
Ian Rogers 63c939aadc am da204c5c: am 62980e81: Inline ldrex/strex for thumb2, remove ARMv5 remnants.
* commit 'da204c5c4244ea67aacbd29c222d0a2d1c35b443':
  Inline ldrex/strex for thumb2, remove ARMv5 remnants.
2013-03-21 21:41:49 +00:00
Ian Rogers da204c5c42 am 62980e81: Inline ldrex/strex for thumb2, remove ARMv5 remnants.
* commit '62980e817c51c56208971ed5c3e98e0cb21e1685':
  Inline ldrex/strex for thumb2, remove ARMv5 remnants.
2013-03-21 21:38:24 +00:00
William Roberts bfd71b489b Create a new location for /data policy files
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
2013-03-21 14:26:12 -07:00
Ian Rogers 62980e817c Inline ldrex/strex for thumb2, remove ARMv5 remnants.
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 80c3b278fd)

Change-Id: I194a3d08e933c63f79d48288d9235b4e64099340
2013-03-21 12:37:35 -07:00
Stephen Smalley c0317a7579 Fix mode on /data/security.
Change-Id: Id97d06a1c360c7871361db147f76b8a2eaceca42
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2013-03-21 14:25:16 -04:00
The Android Automerger e94c404015 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-21 05:56:12 -07:00
Geremy Condra a0524d0815 am 6ed65d5e: am 033b7f24: am a3c3709e: (-s ours) am 028e38f6: Merge "Create a new location for /data policy files"
* commit '6ed65d5e7f4d98de5bea34e71c33abd5a7be9b32':
  Create a new location for /data policy files
2013-03-21 08:23:49 +00:00
Geremy Condra 6ed65d5e7f am 033b7f24: am a3c3709e: (-s ours) am 028e38f6: Merge "Create a new location for /data policy files"
* commit '033b7f244655af0e638aa608bb868237ec0282e4':
  Create a new location for /data policy files
2013-03-21 08:22:29 +00:00
Geremy Condra 033b7f2446 am a3c3709e: (-s ours) am 028e38f6: Merge "Create a new location for /data policy files"
* commit 'a3c3709ead0505f1c872bbf3a42999deb727e2ff':
  Create a new location for /data policy files
2013-03-21 01:19:32 -07:00
Geremy Condra a3c3709ead am 028e38f6: Merge "Create a new location for /data policy files"
* commit '028e38f691c12c3f6f034dd192e5efcae8e767c7':
  Create a new location for /data policy files
2013-03-20 23:45:15 -07:00
Geremy Condra 028e38f691 Merge "Create a new location for /data policy files" 2013-03-21 05:40:26 +00:00
William Roberts 46e1bd89b4 Create a new location for /data policy files
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
2013-03-20 19:34:55 -07:00
Rom Lemarchand 6ad53df633 liblogwrap: use POLLHUP flag to check when a child dies
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
2013-03-20 16:26:22 -07:00
Colin Cross 0b56fc769d android_filesystem_config: add /vendor
Make /vendor have the same permissions as /system/vendor for devices
that have a vendor partition.

Bug: 8341435
Change-Id: I077a2caf9da41fc072a4d3e334be28c24b70c7cd
2013-03-20 19:06:11 +00:00
Elliott Hughes 725b1d8cf8 am 127013c1: am 7bce39ca: am 2690482a: am 55e1df47: Merge "debuggerd: Fix minor memory leak"
* commit '127013c1627b75a24610b66dda01de9a91446789':
  debuggerd: Fix minor memory leak
2013-03-20 17:51:45 +00:00
Elliott Hughes 127013c162 am 7bce39ca: am 2690482a: am 55e1df47: Merge "debuggerd: Fix minor memory leak"
* commit '7bce39cac65166f39d0f26453da6e59e236d2ab5':
  debuggerd: Fix minor memory leak
2013-03-20 17:41:21 +00:00
Elliott Hughes 7bce39cac6 am 2690482a: am 55e1df47: Merge "debuggerd: Fix minor memory leak"
* commit '2690482a35562fc2f5c8a2164f10ffba1d27e599':
  debuggerd: Fix minor memory leak
2013-03-20 10:34:28 -07:00
Elliott Hughes 2690482a35 am 55e1df47: Merge "debuggerd: Fix minor memory leak"
* commit '55e1df471bb6e786c46a64d7ea99e224a6c46af2':
  debuggerd: Fix minor memory leak
2013-03-20 10:26:11 -07:00
Elliott Hughes 55e1df471b Merge "debuggerd: Fix minor memory leak" 2013-03-20 17:04:44 +00:00
Liangtao Gao 0632ad4577 debuggerd: Fix minor memory leak
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>
2013-03-20 10:00:58 -07:00
The Android Open Source Project 5c8cff772f am 3c7eb2a2: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '3c7eb2a2ba1f97814d39c23e6dea0afa7ff92240':
2013-03-20 16:41:58 +00:00
The Android Open Source Project 3c7eb2a2ba Reconcile with jb-mr2-release - do not merge
Change-Id: I12e6984817c915f51a7297a950a47b79de036679
2013-03-20 09:33:05 -07:00
The Android Automerger 4cf20a1f7f merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-19 05:56:06 -07:00
Alex Ray b178fbe67b am ee2dccf2: am 66317770: cutils: trace: add asynchronous events
* commit 'ee2dccf21b61094a0fd782d32f221804b0a7d3fa':
  cutils: trace: add asynchronous events
2013-03-19 00:30:03 +00:00
Alex Ray ee2dccf21b am 66317770: cutils: trace: add asynchronous events
* commit '66317770d37c012b12609defdc750304c97bd8d3':
  cutils: trace: add asynchronous events
2013-03-19 00:29:05 +00:00
Alex Ray 66317770d3 cutils: trace: add asynchronous events
Change-Id: Ia09d34cbc6c8c85fb3d0f1a7e95de53d1b79e998
2013-03-18 13:33:38 -07:00
The Android Automerger e695b8d6ec merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-18 05:57:02 -07:00
Nick Kralevich c8d85a4b24 am c99742b5: am db3eb684: am e657e0c2: am 1a2bdd6f: Merge "liblog: fix fd leakage"
* commit 'c99742b54e483ce0806ef1f1d3580b50d8e2d166':
  liblog: fix fd leakage
2013-03-15 17:13:10 +00:00
Nick Kralevich c99742b54e am db3eb684: am e657e0c2: am 1a2bdd6f: Merge "liblog: fix fd leakage"
* commit 'db3eb6844c361acff2a0f78325d8227695bb40b5':
  liblog: fix fd leakage
2013-03-15 17:10:34 +00:00
Nick Kralevich db3eb6844c am e657e0c2: am 1a2bdd6f: Merge "liblog: fix fd leakage"
* commit 'e657e0c2a4a30104c650e7ad8827e8e887af0cb9':
  liblog: fix fd leakage
2013-03-15 10:08:30 -07:00
Nick Kralevich e657e0c2a4 am 1a2bdd6f: Merge "liblog: fix fd leakage"
* commit '1a2bdd6fbef8119e05be703658ef7fa2017ecf6e':
  liblog: fix fd leakage
2013-03-15 10:06:45 -07:00