From 3dd8f1603f07b0973685302fda6a7113a0ada644 Mon Sep 17 00:00:00 2001 From: Dmitri Plotnikov Date: Tue, 7 Sep 2021 11:09:42 -0700 Subject: [PATCH] Fix implementation of LongArrayMultiStateCounter.toString() The order of arguments was incorrect. Test: atest FrameworksCoreTests:LongArrayMultiStateCounterTest Change-Id: I49aa3a1731ca4b53be9855de0c8ca9dc9d5d1227 --- .../com_android_internal_os_LongArrayMultiStateCounter.cpp | 2 +- .../android/internal/os/LongArrayMultiStateCounterTest.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/core/jni/com_android_internal_os_LongArrayMultiStateCounter.cpp b/core/jni/com_android_internal_os_LongArrayMultiStateCounter.cpp index 953902a2d7199..32c57d1177b41 100644 --- a/core/jni/com_android_internal_os_LongArrayMultiStateCounter.cpp +++ b/core/jni/com_android_internal_os_LongArrayMultiStateCounter.cpp @@ -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(nativePtr); return env->NewStringUTF(counter->toString().c_str()); diff --git a/core/tests/coretests/src/com/android/internal/os/LongArrayMultiStateCounterTest.java b/core/tests/coretests/src/com/android/internal/os/LongArrayMultiStateCounterTest.java index 26296f16383fa..2da9f5761294d 100644 --- a/core/tests/coretests/src/com/android/internal/os/LongArrayMultiStateCounterTest.java +++ b/core/tests/coretests/src/com/android/internal/os/LongArrayMultiStateCounterTest.java @@ -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}]"); } }