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

Commit 5d6f8452 authored by Ruchir Rastogi's avatar Ruchir Rastogi Committed by Automerger Merge Worker
Browse files

Merge "Use default LogEvent copy constructor" into rvc-dev am: 18fb866d am: 465981ec 

Change-Id: I6ad7168955c89d0e098717351a8564bfe2990732
parents e41672ae 465981ec

cmds/statsd/src/logd/LogEvent.cpp

+0 −9
Original line number Original line Diff line number Diff line
@@ -66,15 +66,6 @@ using std::vector; 
#define ATTRIBUTION_CHAIN_TYPE 0x09

#define ATTRIBUTION_CHAIN_TYPE 0x09

#define ERROR_TYPE 0x0F

#define ERROR_TYPE 0x0F





LogEvent::LogEvent(const LogEvent& event) {

    mTagId = event.mTagId;

    mLogUid = event.mLogUid;

    mLogPid = event.mLogPid;

    mElapsedTimestampNs = event.mElapsedTimestampNs;

    mLogdTimestampNs = event.mLogdTimestampNs;

    mValues = event.mValues;

}



LogEvent::LogEvent(int32_t uid, int32_t pid)

LogEvent::LogEvent(int32_t uid, int32_t pid)

    : mLogdTimestampNs(time(nullptr)), mLogUid(uid), mLogPid(pid) {

    : mLogdTimestampNs(time(nullptr)), mLogUid(uid), mLogPid(pid) {

}

}

cmds/statsd/src/logd/LogEvent.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -216,7 +216,7 @@ private: 
    /**

    /**

     * Only use this if copy is absolutely needed.

     * Only use this if copy is absolutely needed.

     */

     */

    LogEvent(const LogEvent&);

    LogEvent(const LogEvent&) = default;





    void parseInt32(int32_t* pos, int32_t depth, bool* last, uint8_t numAnnotations);

    void parseInt32(int32_t* pos, int32_t depth, bool* last, uint8_t numAnnotations);

    void parseInt64(int32_t* pos, int32_t depth, bool* last, uint8_t numAnnotations);

    void parseInt64(int32_t* pos, int32_t depth, bool* last, uint8_t numAnnotations);