Commit graph

5277 commits

Author SHA1 Message Date
Keun-young Park
9c37960cd9 am 9b32f87a: Merge "Add Mips memset speedup"
* commit '9b32f87a8c489a15baea535800b7c309014bd0ee':
  Add Mips memset speedup
2013-03-29 16:09:10 -07:00
Keun-young Park
9b32f87a8c Merge "Add Mips memset speedup" 2013-03-29 21:05:23 +00:00
Nick Kralevich
a078c0e0e1 am d67bbab6: am a56b0b97: am 191fe44c: Merge "run-as: Don\'t require CAP_DAC_READ_SEARCH"
* commit 'd67bbab6d873c073fa5c3bdb93e8f32106898123':
  run-as: Don't require CAP_DAC_READ_SEARCH
2013-03-29 10:26:17 -07:00
Nick Kralevich
d67bbab6d8 am a56b0b97: am 191fe44c: Merge "run-as: Don\'t require CAP_DAC_READ_SEARCH"
* commit 'a56b0b97ddd64a9558975c470ea6d09b4f10575e':
  run-as: Don't require CAP_DAC_READ_SEARCH
2013-03-29 10:21:55 -07:00
Nick Kralevich
a56b0b97dd am 191fe44c: Merge "run-as: Don\'t require CAP_DAC_READ_SEARCH"
* commit '191fe44c972e7f45f4bac1cee27522ae244da498':
  run-as: Don't require CAP_DAC_READ_SEARCH
2013-03-29 10:00:56 -07:00
The Android Open Source Project
e4e16d0cfb Reconcile with jb-mr2-release - do not merge
Change-Id: Ia1e9aa160247d491cc60c1dcc7a73c8545410d78
2013-03-29 09:49:30 -07:00
Nick Kralevich
191fe44c97 Merge "run-as: Don't require CAP_DAC_READ_SEARCH" 2013-03-29 16:24:06 +00:00
Nick Kralevich
b0f1540f2a run-as: Don't require CAP_DAC_READ_SEARCH
This is a partial AOSP port of Google internal change
080427e4e2 .

Change-Id: I23a7edc808d227caf3862b035dc2ca39639d9d59
2013-03-29 08:55:06 -07:00
Geremy Condra
83f9cdf0c8 am 46e89912: am f19e045c: am c8df252f: Merge "run-as: Get seinfo from packages.list and pass to libselinux."
* commit '46e8991209508a9f5d59bf97ed39b791444dbaf7':
  run-as: Get seinfo from packages.list and pass to libselinux.
2013-03-28 14:34:57 -07:00
Geremy Condra
46e8991209 am f19e045c: am c8df252f: Merge "run-as: Get seinfo from packages.list and pass to libselinux."
* commit 'f19e045c58dafbdc46e848ec5a5c935f472dea34':
  run-as: Get seinfo from packages.list and pass to libselinux.
2013-03-28 14:32:49 -07:00
Geremy Condra
f19e045c58 am c8df252f: Merge "run-as: Get seinfo from packages.list and pass to libselinux."
* commit 'c8df252fa16d328be197ecc5280a2f8c2aacb5ad':
  run-as: Get seinfo from packages.list and pass to libselinux.
2013-03-28 14:30:36 -07:00
Jamie Gennis
38e1bb8617 am 774f9299: libcutils: add support for app tracing
* commit '774f9299912cdf9f2a6b3805bb557e30bafbad05':
  libcutils: add support for app tracing
2013-03-28 14:02:55 -07:00
Jamie Gennis
774f929991 libcutils: add support for app tracing
This change adds support for tracing using the ATRACE_TAG_APP tag.  This tag is
enabled only for processes in which the /proc/<pid>/cmdline value appears in
the comma-separated list of such values in the debug.atrace.app_cmdlines system
property.  It is also only enabled if either the ro.debuggable system property
is set to 1 or the application has declared itself debuggable in its manifest,
which gets reported to libcutils by the framework.

Change-Id: Ic94ba55f4e70a9cf994056acbf151e523428b65d
2013-03-28 20:59:31 +00:00
Geremy Condra
c8df252fa1 Merge "run-as: Get seinfo from packages.list and pass to libselinux." 2013-03-28 20:30:57 +00:00
The Android Automerger
d982d29dc2 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-28 05:56:36 -07:00
Robert Craig
fced3ded83 run-as: Get seinfo from packages.list and pass to libselinux.
Change allows the proper seinfo value to be passed
to libselinux to switch to the proper app security
context before running the shell.

Change-Id: I9d7ea47c920b1bc09a19008345ed7fd0aa426e87
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2013-03-28 06:04:39 -04:00
Geremy Condra
a9d7c5296f am de97f798: am bed08333: am c0e1bc1c: Merge "Drop /data/system as a policy file location"
* commit 'de97f798a1c24303de35ff44e2f47b590b46a815':
  Drop /data/system as a policy file location
2013-03-27 17:11:02 -07:00
Geremy Condra
de97f798a1 am bed08333: am c0e1bc1c: Merge "Drop /data/system as a policy file location"
* commit 'bed08333d921e97bc60b81c0f183816386709d79':
  Drop /data/system as a policy file location
2013-03-27 16:42:21 -07:00
Geremy Condra
bed08333d9 am c0e1bc1c: Merge "Drop /data/system as a policy file location"
* commit 'c0e1bc1c755b165574c761e878b6fc26fb340ba0':
  Drop /data/system as a policy file location
2013-03-27 16:40:25 -07:00
Geremy Condra
c0e1bc1c75 Merge "Drop /data/system as a policy file location" 2013-03-27 22:39:47 +00:00
William Roberts
04561b6347 Drop /data/system as a policy file location
/data/system is no longer used as a policy
file location. Use /data/security instead.

Change-Id: Ie77be9e25c67c8a2157c7b6c468f3215a49ead52
2013-03-26 23:33:18 +00:00
The Android Open Source Project
540c9fbaf5 Reconcile with jb-mr2-release - do not merge
Change-Id: I2a7a7aed31eaf87aac6359a320d4b8c3f3d6b034
2013-03-26 10:49:57 -07:00
The Android Automerger
584b332134 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-26 05:56:39 -07:00
Igor Murashkin
858c8fe7f9 am d118394d: Merge "Properly handle cases of multiple inotify events" into jb-mr2-dev
* commit 'd118394d444107dba4430723d248863ff412c444':
  Properly handle cases of multiple inotify events
2013-03-26 01:14:42 +00:00
Igor Murashkin
d118394d44 Merge "Properly handle cases of multiple inotify events" into jb-mr2-dev 2013-03-26 01:12:44 +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
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
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
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
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
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
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