tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "ueventd: remove leftovers of the SELinux policy update mechanism"

Browse source 
am: 6a8314c8bf

Change-Id: I14053438d05ae8f9be8ddf7e4444c542706a974c
This commit is contained in:
Tom Cherry 2017-05-01 22:55:22 +00:00 committed by android-build-merger
commit c2c8f5e0dc
1 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
init/devices.cpp
View file

@ -47,7 +47,6 @@
#include <cutils/uevent.h>
#include <private/android_filesystem_config.h>
#include <selinux/android.h>
#include <selinux/avc.h>
#include <selinux/label.h>
#include <selinux/selinux.h>
@ -783,15 +782,6 @@ coldboot_action_t handle_device_fd(coldboot_callback fn)
{
coldboot_action_t ret = handle_device_fd_with(
[&](uevent* uevent) -> coldboot_action_t {
if (selinux_status_updated() > 0) {
struct selabel_handle *sehandle2;
sehandle2 = selinux_android_file_context_handle();
if (sehandle2) {
selabel_close(sehandle);
sehandle = sehandle2;
}
}
// default is to always create the devices
coldboot_action_t act = COLDBOOT_CREATE;
if (fn) {
@ -881,7 +871,6 @@ void device_init(const char* path, coldboot_callback fn) {
return;
}
fcntl(device_fd, F_SETFL, O_NONBLOCK);
selinux_status_open(true);
}
if (access(COLDBOOT_DONE, F_OK) == 0) {
@ -915,7 +904,6 @@ void device_init(const char* path, coldboot_callback fn) {
void device_close() {
platform_devices.clear();
device_fd.reset();
selinux_status_close();
}
int get_device_fd() {