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

Commit c17ca50b authored by Hunter Knepshield's avatar Hunter Knepshield Committed by android-build-merger
Browse files

Merge "Fix minor time bug in ConsentCallback::getElapsedTimeMs" 

am: 3ed75889

Change-Id: Idda4a1965dec2ab4eb78257f3c4451d7b08e6381
parents 7ae4bc7d 3ed75889

cmds/dumpstate/DumpstateInternal.h

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 


// TODO: use functions from <chrono> instead

const uint64_t NANOS_PER_SEC = 1000000000;

const uint64_t NANOS_PER_MILLI = 1000000;

uint64_t Nanotime();



// Switches to non-root user and group.

cmds/dumpstate/dumpstate.cpp

+1 −1
Original line number Diff line number Diff line
@@ -660,7 +660,7 @@ UserConsentResult Dumpstate::ConsentCallback::getResult() { 
}



uint64_t Dumpstate::ConsentCallback::getElapsedTimeMs() const {

    return Nanotime() - start_time_;

    return (Nanotime() - start_time_) / NANOS_PER_MILLI;

}



void Dumpstate::PrintHeader() const {