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

Commit 7bbb008d authored by Bart Van Assche's avatar Bart Van Assche Committed by Gerrit Code Review
Browse files

Merge "Make more DeviceHandler member functions private" into main

parents c0305b14 254436b3

init/devices.h

+2 −3
Original line number Original line Diff line number Diff line
@@ -127,9 +127,6 @@ class DeviceHandler : public UeventHandler { 
    virtual ~DeviceHandler() = default;

    virtual ~DeviceHandler() = default;





    void HandleUevent(const Uevent& uevent) override;

    void HandleUevent(const Uevent& uevent) override;

    void ColdbootDone() override;



    std::vector<std::string> GetBlockDeviceSymlinks(const Uevent& uevent) const;





    // `androidboot.partition_map` allows associating a partition name for a raw block device

    // `androidboot.partition_map` allows associating a partition name for a raw block device

    // through a comma separated and semicolon deliminated list. For example,

    // through a comma separated and semicolon deliminated list. For example,
@@ -138,11 +135,13 @@ class DeviceHandler : public UeventHandler { 
    static std::string GetPartitionNameForDevice(const std::string& device);

    static std::string GetPartitionNameForDevice(const std::string& device);





  private:

  private:

    void ColdbootDone() override;

    bool FindPlatformDevice(std::string path, std::string* platform_device_path) const;

    bool FindPlatformDevice(std::string path, std::string* platform_device_path) const;

    std::tuple<mode_t, uid_t, gid_t> GetDevicePermissions(

    std::tuple<mode_t, uid_t, gid_t> GetDevicePermissions(

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

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

    void MakeDevice(const std::string& path, bool block, int major, int minor,

    void MakeDevice(const std::string& path, bool block, int major, int minor,

                    const std::vector<std::string>& links) const;

                    const std::vector<std::string>& links) const;

    std::vector<std::string> GetBlockDeviceSymlinks(const Uevent& uevent) const;

    void HandleDevice(const std::string& action, const std::string& devpath, bool block, int major,

    void HandleDevice(const std::string& action, const std::string& devpath, bool block, int major,

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

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

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

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