From 7c3c7c52a4210eeceeeeffe7af1a09cd587d2bcd Mon Sep 17 00:00:00 2001 From: David Su Date: Wed, 30 Oct 2019 13:52:41 -0700 Subject: Statsd: Clean up WifiActivityEnergyInfo Bug: 145244073 Test: m -j statsd_test && adb root && adb sync data && adb shell data/nativetest64/statsd_test/statsd_test Test: atest CtsStatsdHostTestCases Change-Id: I21ad86e0d66bc6d10aa6e7d720963f22d11153cf --- .../java/com/android/server/stats/StatsCompanionService.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/apex/statsd/service/java/com/android/server/stats/StatsCompanionService.java b/apex/statsd/service/java/com/android/server/stats/StatsCompanionService.java index 62c77ef20871..252f961563ff 100644 --- a/apex/statsd/service/java/com/android/server/stats/StatsCompanionService.java +++ b/apex/statsd/service/java/com/android/server/stats/StatsCompanionService.java @@ -1163,12 +1163,12 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { final WifiActivityEnergyInfo wifiInfo = awaitControllerInfo(wifiReceiver); StatsLogEventWrapper e = new StatsLogEventWrapper(tagId, elapsedNanos, wallClockNanos); - e.writeLong(wifiInfo.getTimeStamp()); + e.writeLong(wifiInfo.getTimeSinceBootMillis()); e.writeInt(wifiInfo.getStackState()); - e.writeLong(wifiInfo.getControllerTxTimeMillis()); - e.writeLong(wifiInfo.getControllerRxTimeMillis()); - e.writeLong(wifiInfo.getControllerIdleTimeMillis()); - e.writeLong(wifiInfo.getControllerEnergyUsed()); + e.writeLong(wifiInfo.getControllerTxDurationMillis()); + e.writeLong(wifiInfo.getControllerRxDurationMillis()); + e.writeLong(wifiInfo.getControllerIdleDurationMillis()); + e.writeLong(wifiInfo.getControllerEnergyUsedMicroJoules()); pulledData.add(e); } catch (RemoteException e) { Slog.e(TAG, -- cgit v1.2.3-59-g8ed1b