From 254436b3ae008853837e2a2a1232c12b92f67a72 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 23 May 2024 11:14:50 -0700 Subject: [PATCH] Make more DeviceHandler member functions private Make all member functions private that are not called from outside DeviceHandlermember functions. Bug: 335708738 Change-Id: Ibe2e5f6b8b45a79b5be59665627e0a46de4e439a Signed-off-by: Bart Van Assche --- init/devices.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/init/devices.h b/init/devices.h index 44ce2a920..6da123259 100644 --- a/init/devices.h +++ b/init/devices.h @@ -127,9 +127,6 @@ class DeviceHandler : public UeventHandler { virtual ~DeviceHandler() = default; void HandleUevent(const Uevent& uevent) override; - void ColdbootDone() override; - - std::vector GetBlockDeviceSymlinks(const Uevent& uevent) const; // `androidboot.partition_map` allows associating a partition name for a raw block device // 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); private: + void ColdbootDone() override; bool FindPlatformDevice(std::string path, std::string* platform_device_path) const; std::tuple GetDevicePermissions( const std::string& path, const std::vector& links) const; void MakeDevice(const std::string& path, bool block, int major, int minor, const std::vector& links) const; + std::vector GetBlockDeviceSymlinks(const Uevent& uevent) const; void HandleDevice(const std::string& action, const std::string& devpath, bool block, int major, int minor, const std::vector& links) const; void FixupSysPermissions(const std::string& upath, const std::string& subsystem) const;