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

Commit e4de6b62 authored by Benjamin Schwartz's avatar Benjamin Schwartz Committed by Automerger Merge Worker
Browse files

Merge "powerstats: native energy meter returning incorrect duration" into sc-dev am: d7a26390 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13435663

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6d682200b5614c0874ea0630c9165c8e3833e1b2
parents 229384db d7a26390

services/core/jni/com_android_server_powerstats_PowerStatsService.cpp

+2 −1
Original line number Diff line number Diff line
@@ -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);