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

Commit 4e9bf955 authored by Tom Cherry's avatar Tom Cherry
Browse files

logd: remove class LogCommand, rename LogCommand.cpp to LogPermissions.cpp 

class LogCommand isn't needed, so remove it.  Since the rest of
LogCommand.cpp only has to do with permissions, rename it
appropriately.

Test: logging unit tests
Change-Id: I32d09c74d00b6e50083e46832eca3dd886b46682
parent 227dd4f8

logd/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -32,10 +32,10 @@ cc_library_static { 
    name: "liblogd",



    srcs: [

        "LogCommand.cpp",

        "ChattyLogBuffer.cpp",

        "CommandListener.cpp",

        "LogListener.cpp",

        "LogPermissions.cpp",

        "LogReader.cpp",

        "LogReaderList.cpp",

        "LogReaderThread.cpp",

logd/CommandListener.cpp

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
#include <private/android_filesystem_config.h>

#include <sysutils/SocketClient.h>



#include "LogUtils.h"

#include "LogPermissions.h"



CommandListener::CommandListener(LogBuffer* buf, LogTags* tags, PruneList* prune,

                                 LogStatistics* stats)

logd/CommandListener.h

+15 −15
Original line number Diff line number Diff line
@@ -16,10 +16,10 @@ 


#pragma once



#include <sysutils/FrameworkCommand.h>

#include <sysutils/FrameworkListener.h>



#include "LogBuffer.h"

#include "LogCommand.h"

#include "LogListener.h"

#include "LogStatistics.h"

#include "LogTags.h"
@@ -39,10 +39,10 @@ class CommandListener : public FrameworkListener { 
    LogStatistics* stats_;



#define LogCmd(name, command_string)                                \

    class name##Cmd : public LogCommand {                        \

    class name##Cmd : public FrameworkCommand {                     \

      public:                                                       \

        explicit name##Cmd(CommandListener* parent)                 \

            : LogCommand(#command_string), parent_(parent) {}    \

            : FrameworkCommand(#command_string), parent_(parent) {} \

        virtual ~name##Cmd() {}                                     \

        int runCommand(SocketClient* c, int argc, char** argv);     \

                                                                    \

logd/LogBufferElement.cpp

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include <log/log_read.h>

#include <private/android_logger.h>



#include "LogCommand.h"

#include "LogStatistics.h"

#include "LogUtils.h"

logd/LogListener.cpp

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 


#include "LogBuffer.h"

#include "LogListener.h"

#include "LogUtils.h"

#include "LogPermissions.h"



LogListener::LogListener(LogBuffer* buf) : socket_(GetLogSocket()), logbuf_(buf) {}