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

Commit 3dd8f160 authored by Dmitri Plotnikov's avatar Dmitri Plotnikov
Browse files

Fix implementation of LongArrayMultiStateCounter.toString() 

The order of arguments was incorrect.

Test: atest FrameworksCoreTests:LongArrayMultiStateCounterTest
Change-Id: I49aa3a1731ca4b53be9855de0c8ca9dc9d5d1227
parent b20a6924

core/jni/com_android_internal_os_LongArrayMultiStateCounter.cpp

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

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

+5 −0
Original line number Diff line number Diff line
@@ -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}]");

    }

}