Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix implementation of LongArrayMultiStateCounter.toString()"

Browse Source
This commit is contained in:
TreeHugger Robot
2021-09-08 03:16:30 +00:00
committed by Android (Google) Code Review
parent 785b3c96a4 3dd8f1603f
commit 60e38f483c
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/jni/com_android_internal_os_LongArrayMultiStateCounter.cpp
View File

@@ -63,7 +63,7 @@ static void native_getCounts(jlong nativePtr, jlong longArrayContainerNativePtr,
*vector = counter->getCount(state);
}
static jobject native_toString(JNIEnv *env, jlong nativePtr, jobject self) {
static jobject native_toString(JNIEnv *env, jobject self, jlong nativePtr) {
battery::LongArrayMultiStateCounter *counter =
reinterpret_cast<battery::LongArrayMultiStateCounter *>(nativePtr);
return env->NewStringUTF(counter->toString().c_str());

5
core/tests/coretests/src/com/android/internal/os/LongArrayMultiStateCounterTest.java
View File

@@ -46,5 +46,10 @@ public class LongArrayMultiStateCounterTest {
counter.getCounts(longArrayContainer, 1);
longArrayContainer.getValues(result);
assertThat(result).isEqualTo(new long[]{25, 50, 75, 100});
assertThat(counter.toString()).isEqualTo(
"currentState: 0 lastStateChangeTimestamp: 9000 lastUpdateTimestamp: 9000 states:"
+ " [0: time: 0 counter: { 75, 150, 225, 300}"
+ ", 1: time: 0 counter: { 25, 50, 75, 100}]");
}
}