diff options
| author | Kenny Root <kroot@android.com> | 2012-08-13 09:10:32 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-08-13 09:10:32 -0700 |
| commit | 297f802f25d093274c1f5fb890ee8dfacfbf159e (patch) | |
| tree | 2a4f64c615dfcefb2b736e11afa09fdb9648cf19 /init/devices.c | |
| parent | 605f8706c88b2cd5d024b0a6b7253a78d968ba72 (diff) | |
| parent | ae6f3d7c05070f7e0e56fe0056c8923c6ee2f473 (diff) | |
| download | system_core-297f802f25d093274c1f5fb890ee8dfacfbf159e.tar.gz system_core-297f802f25d093274c1f5fb890ee8dfacfbf159e.tar.bz2 system_core-297f802f25d093274c1f5fb890ee8dfacfbf159e.zip | |
Merge "Add support for reloading policy from /data/system."
Diffstat (limited to 'init/devices.c')
| -rw-r--r-- | init/devices.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/init/devices.c b/init/devices.c index c367de87..597f9583 100644 --- a/init/devices.c +++ b/init/devices.c @@ -33,6 +33,7 @@ #ifdef HAVE_SELINUX #include <selinux/selinux.h> #include <selinux/label.h> +#include <selinux/android.h> #endif #include <private/android_filesystem_config.h> @@ -871,12 +872,10 @@ void device_init(void) struct stat info; int fd; #ifdef HAVE_SELINUX - struct selinux_opt seopts[] = { - { SELABEL_OPT_PATH, "/file_contexts" } - }; - - if (is_selinux_enabled() > 0) - sehandle = selabel_open(SELABEL_CTX_FILE, seopts, 1); + sehandle = NULL; + if (is_selinux_enabled() > 0) { + sehandle = selinux_android_file_context_handle(); + } #endif /* is 64K enough? udev uses 16MB! */ device_fd = uevent_open_socket(64*1024, true); |