summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Schwartz <bsschwar@google.com>2021-01-29 08:24:07 -0800
committerBenjamin Schwartz <bsschwar@google.com>2021-01-29 08:27:06 -0800
commit46a569765fabd600809ca4e40fa26d376a06657e (patch)
treef37a10683789068b06a8ca5a3bd995fc2f817103
parent80bb0561bfd2bcb5821396b36219a81b23987982 (diff)
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
-rw-r--r--services/core/jni/com_android_server_powerstats_PowerStatsService.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/jni/com_android_server_powerstats_PowerStatsService.cpp b/services/core/jni/com_android_server_powerstats_PowerStatsService.cpp
index 1208354899d5..3f54529211dd 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);