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

Commit 36aede93 authored by Tri Vo's avatar Tri Vo Committed by android-build-merger
Browse files

ueventd: duplicate /dev/ashmem am: ff89b8d8 

am: 9d177091

Change-Id: I64f7c14b19e55652de7b5b02c8685d2937d5f1e8
parents 18a7e9e1 9d177091

init/devices.cpp

+21 −0
Original line number Diff line number Diff line
@@ -441,6 +441,23 @@ void DeviceHandler::HandleDevice(const std::string& action, const std::string& d 
    }

}



void DeviceHandler::HandleAshmemUevent(const Uevent& uevent) {

    if (uevent.device_name == "ashmem") {

        static const std::string boot_id_path = "/proc/sys/kernel/random/boot_id";

        std::string boot_id;

        if (!ReadFileToString(boot_id_path, &boot_id)) {

            PLOG(ERROR) << "Cannot duplicate ashmem device node. Failed to read " << boot_id_path;

            return;

        };

        boot_id = Trim(boot_id);



        Uevent dup_ashmem_uevent = uevent;

        dup_ashmem_uevent.device_name += boot_id;

        dup_ashmem_uevent.path += boot_id;

        HandleUevent(dup_ashmem_uevent);

    }

}



void DeviceHandler::HandleUevent(const Uevent& uevent) {

    if (uevent.action == "add" || uevent.action == "change" || uevent.action == "online") {

        FixupSysPermissions(uevent.path, uevent.subsystem);
@@ -485,6 +502,10 @@ void DeviceHandler::HandleUevent(const Uevent& uevent) { 
    mkdir_recursive(Dirname(devpath), 0755);



    HandleDevice(uevent.action, devpath, block, uevent.major, uevent.minor, links);



    // Duplicate /dev/ashmem device and name it /dev/ashmem<boot_id>.

    // TODO(b/111903542): remove once all users of /dev/ashmem are migrated to libcutils API.

    HandleAshmemUevent(uevent);

}



void DeviceHandler::ColdbootDone() {

init/devices.h

+1 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ class DeviceHandler : public UeventHandler { 
    void HandleDevice(const std::string& action, const std::string& devpath, bool block, int major,

                      int minor, const std::vector<std::string>& links) const;

    void FixupSysPermissions(const std::string& upath, const std::string& subsystem) const;

    void HandleAshmemUevent(const Uevent& uevent);



    std::vector<Permissions> dev_permissions_;

    std::vector<SysfsPermissions> sysfs_permissions_;

rootdir/ueventd.rc

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ subsystem sound 
/dev/urandom              0666   root       root

# Make HW RNG readable by group system to let EntropyMixer read it.

/dev/hw_random            0440   root       system

/dev/ashmem               0666   root       root

/dev/ashmem*              0666   root       root

/dev/binder               0666   root       root

/dev/hwbinder             0666   root       root

/dev/vndbinder            0666   root       root