Merge "Fixed indent in NBLog.h"

        EVENT_INTEGER,              // integer value entry

        EVENT_FLOAT,                // floating point value entry

        EVENT_PID,                  // process ID and process name

    EVENT_AUTHOR,               // author index (present in merged logs) tracks entry's original log

    EVENT_START_FMT,            // logFormat start event: entry includes format string, following

                                // entries contain format arguments

        EVENT_AUTHOR,               // author index (present in merged logs) tracks entry's

                                    // original log

        EVENT_START_FMT,            // logFormat start event: entry includes format string,

                                    // following entries contain format arguments

        EVENT_HASH,                 // unique HASH of log origin, originates from hash of file name

                                    // and line number

        EVENT_HISTOGRAM_ENTRY_TS,   // single datum for timestamp histogram

    EVENT_AUDIO_STATE,          // audio on/off event: logged upon FastMixer::onStateChange() call

        EVENT_AUDIO_STATE,          // audio on/off event: logged on FastMixer::onStateChange call

        EVENT_END_FMT,              // end of logFormat argument list

        EVENT_UPPER_BOUND,          // to check for invalid events

            : mEvent(event), mLength(length), mData(data) { }

        /*virtual*/ ~Entry() { }

    // used during writing to format Entry information as follows: [type][length][data ... ][length]

        // used during writing to format Entry information as follows:

        // [type][length][data ... ][length]

        int     copyEntryDataAt(size_t offset) const;

    private:

        void    log(const Entry *entry, bool trusted = false);

        Shared* const   mShared;    // raw pointer to shared memory

    sp<IMemory>     mIMemory;   // ref-counted version, initialized in constructor and then const

    audio_utils_fifo * const mFifo;                 // FIFO itself,

                                                    // non-NULL unless constructor fails

    audio_utils_fifo_writer * const mFifoWriter;    // used to write to FIFO,

                                                    // non-NULL unless dummy constructor used

        sp<IMemory>     mIMemory;   // ref-counted version, initialized in constructor

                                    // and then const

        audio_utils_fifo * const mFifo;                 // FIFO itself, non-NULL

                                                        // unless constructor fails

        audio_utils_fifo_writer * const mFifoWriter;    // used to write to FIFO, non-NULL

                                                        // unless dummy constructor used

        bool            mEnabled;   // whether to actually log

        // cached pid and process name to use in %p format specifier

        // TODO: it might be clearer, instead of a direct map from source location to vector of

        // timestamps, if we instead first mapped from source location to an object that

        // represented that location. And one_of its fields would be a vector of timestamps.

    // That would allow us to record other information about the source location beyond timestamps.

        // That would allow us to record other information about the source location beyond

        // timestamps.

        void    dumpLine(const String8& timestamp, String8& body);

        EntryIterator   handleFormat(const FormatEntry &fmtEntry,