Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e40884af authored by Tom Cherry's avatar Tom Cherry Committed by android-build-merger
Browse files

Merge changes from topic \'prop-security\' 

am: 65fc4855

* commit '65fc4855':
  Abort if __system_property_area_init fails
  restorecon /property_contexts
parents eb4426f2 65fc4855

init/init.cpp

+1 −0
Original line number Diff line number Diff line
@@ -602,6 +602,7 @@ int main(int argc, char** argv) { 
    restorecon("/dev");

    restorecon("/dev/socket");

    restorecon("/dev/__properties__");

    restorecon("/property_contexts");

    restorecon_recursive("/sys");



    epoll_fd = epoll_create1(EPOLL_CLOEXEC);

init/property_service.cpp

+2 −1
Original line number Diff line number Diff line
@@ -79,7 +79,8 @@ void property_init() { 
    property_area_initialized = true;



    if (__system_property_area_init()) {

        return;

        ERROR("Failed to initialize property area\n");

        exit(1);

    }



    pa_workspace.size = 0;