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

Commit d9b61224 authored by Greg Kaiser's avatar Greg Kaiser Committed by android-build-merger
Browse files

Merge changes I891f64fb,I6182d84e 

am: 1fd4b364

Change-Id: I2db90f207c6ad337dc40cc7df1cecaf5a38760c3
parents 969259fe 1fd4b364

fastboot/fuzzy_fastboot/usb_transport_sniffer.h

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ class UsbTransportSniffer : public UsbTransport { 


    virtual ssize_t Read(void* data, size_t len) override;

    virtual ssize_t Write(const void* data, size_t len) override;

    virtual int Close() override;

    virtual int Close() override final;  // note usage in destructor

    virtual int Reset() override;



    const std::vector<Event> Transfers();

logcat/tests/logcat_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1230,7 +1230,7 @@ TEST(logcat, blocking_clear) { 
        }



        int size, consumed, max, payload;

        char size_mult[3], consumed_mult[3];

        char size_mult[4], consumed_mult[4];

        size = consumed = max = payload = 0;

        if (6 == sscanf(buffer,

                        "events: ring buffer is %d %3s (%d %3s consumed),"