From 46a569765fabd600809ca4e40fa26d376a06657e Mon Sep 17 00:00:00 2001
From: Benjamin Schwartz <bsschwar@google.com>
Date: Fri, 29 Jan 2021 08:24:07 -0800
Subject: [PATCH] powerstats: native energy meter returning incorrect duration

This API should return timestampMs == durationMs to denote that each
energy measurement has been monitored since boot.

Bug: 168832285
Test: cmd stats pull-source 10038
Test: cmd stats pull-source 10005
Change-Id: Ia4111660e572177dfcbe058fb85df1c140754018
---
 .../jni/com_android_server_powerstats_PowerStatsService.cpp    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/core/jni/com_android_server_powerstats_PowerStatsService.cpp b/services/core/jni/com_android_server_powerstats_PowerStatsService.cpp
index 1208354899d59..3f54529211dde 100644
--- a/services/core/jni/com_android_server_powerstats_PowerStatsService.cpp
+++ b/services/core/jni/com_android_server_powerstats_PowerStatsService.cpp
@@ -335,7 +335,8 @@ static jobjectArray nativeReadEnergyMeters(JNIEnv *env, jclass clazz, jintArray
                                                                   field_EM_timestampMs,
                                                                   energyData[i].timestamp);
                                                 env->SetLongField(energyMeasurement,
-                                                                  field_EM_durationMs, -1);
+                                                                  field_EM_durationMs,
+                                                                  energyData[i].timestamp);
                                                 env->SetLongField(energyMeasurement,
                                                                   field_EM_energyUWs,
                                                                   energyData[i].energy);