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

Commit 07b359e8 authored by Tej Singh's avatar Tej Singh Committed by android-build-merger
Browse files

Merge "Store elapsedRealtimeNs as int64 instead of long" am: dc51e5ef

am: dbd03d7f

Change-Id: I818bf7d4aef6aef09400b5c975d402282e2c4e3a
parents b1a57f75 dbd03d7f
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -128,13 +128,13 @@ private:

    std::unordered_map<ConfigKey, sp<MetricsManager>> mMetricsManagers;

    std::unordered_map<ConfigKey, long> mLastBroadcastTimes;
    std::unordered_map<ConfigKey, int64_t> mLastBroadcastTimes;

    // Last time we sent a broadcast to this uid that the active configs had changed.
    std::unordered_map<int, long> mLastActivationBroadcastTimes;
    std::unordered_map<int, int64_t> mLastActivationBroadcastTimes;

    // Tracks when we last checked the bytes consumed for each config key.
    std::unordered_map<ConfigKey, long> mLastByteSizeTimes;
    std::unordered_map<ConfigKey, int64_t> mLastByteSizeTimes;

    // Tracks which config keys has metric reports on disk
    std::set<ConfigKey> mOnDiskDataConfigs;
@@ -205,7 +205,7 @@ private:

    int64_t mLastTimestampSeen = 0;

    long mLastPullerCacheClearTimeSec = 0;
    int64_t mLastPullerCacheClearTimeSec = 0;

    // Last time we wrote data to disk.
    int64_t mLastWriteTimeNs = 0;