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

Commit 7bcaded3 authored by Matt Buckley's avatar Matt Buckley Committed by Android (Google) Code Review
Browse files

Merge "Change platform WorkDuration to match memory layout of HAL WorkDuration" into main

parents 193c0bb0 a542c795

services/powermanager/WorkDuration.cpp

+2 −1
Original line number Diff line number Diff line
@@ -25,8 +25,9 @@ namespace android::os { 


WorkDuration::WorkDuration(int64_t startTimestampNanos, int64_t totalDurationNanos,

                           int64_t cpuDurationNanos, int64_t gpuDurationNanos)

      : workPeriodStartTimestampNanos(startTimestampNanos),

      : timestampNanos(0),

        actualTotalDurationNanos(totalDurationNanos),

        workPeriodStartTimestampNanos(startTimestampNanos),

        actualCpuDurationNanos(cpuDurationNanos),

        actualGpuDurationNanos(gpuDurationNanos) {}

services/powermanager/include/android/WorkDuration.h

+2 −2
Original line number Diff line number Diff line
@@ -61,11 +61,11 @@ struct WorkDuration : AWorkDuration, android::Parcelable { 
        return os;

    }



    int64_t workPeriodStartTimestampNanos;

    int64_t timestampNanos;

    int64_t actualTotalDurationNanos;

    int64_t workPeriodStartTimestampNanos;

    int64_t actualCpuDurationNanos;

    int64_t actualGpuDurationNanos;

    int64_t timestampNanos;

};



} // namespace android::os