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

Commit 989a67e1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "ueventd: fix other assorted style nits" into main am: 41db2810 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3251531



Change-Id: I554596ba134204315503426645ddbe7e789e17fb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents df40adb5 41db2810

init/devices.cpp

+6 −6
Original line number Original line Diff line number Diff line
@@ -531,7 +531,7 @@ void DeviceHandler::HandleAshmemUevent(const Uevent& uevent) { 
        if (!ReadFileToString(boot_id_path, &boot_id)) {

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

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

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

            return;

            return;

        };

        }

        boot_id = Trim(boot_id);

        boot_id = Trim(boot_id);





        Uevent dup_ashmem_uevent = uevent;

        Uevent dup_ashmem_uevent = uevent;
@@ -542,8 +542,8 @@ void DeviceHandler::HandleAshmemUevent(const Uevent& uevent) { 
}

}





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

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

  if (uevent.action == "add" || uevent.action == "change" ||

    if (uevent.action == "add" || uevent.action == "change" || uevent.action == "bind" ||

      uevent.action == "bind" || uevent.action == "online") {

        uevent.action == "online") {

        FixupSysPermissions(uevent.path, uevent.subsystem);

        FixupSysPermissions(uevent.path, uevent.subsystem);

    }

    }