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

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

Merge "powerstats: native energy meter returning incorrect duration" into... 

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4f231351140509d1adb2f609142b0635bc49cb53
parents 0d48715f e4de6b62

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);