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

Commit b4536cf6 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

Merge "logd: build breakage aosp-brillo-master @ 2508494" am: 727aeb66 

am: d9748c26

* commit 'd9748c26':
  logd: build breakage aosp-brillo-master @ 2508494
parents 580933ef d9748c26

logd/LogKlog.cpp

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ void LogKlog::calculateCorrection(const log_time &monotonic, 
    memset(&tm, 0, sizeof(tm));

    tm.tm_isdst = -1;

    localtime_r(&now, &tm);

    if ((tm.tm_gmtoff < 0) && ((-tm.tm_gmtoff) > real.tv_sec)) {

    if ((tm.tm_gmtoff < 0) && ((-tm.tm_gmtoff) > (long)real.tv_sec)) {

        real = log_time::EPOCH;

    } else {

        real.tv_sec += tm.tm_gmtoff;