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

Commit 33015150 authored by Dmitri Plotnikov's avatar Dmitri Plotnikov
Browse files

Further cleanup after removal of the streamlined_misc_battery_stats flag 

Test: atest PowerStatsTests
Bug: 33125150
Flag: EXEMPT refactor
Change-Id: Iee78b5691ea6dd394d6e48283185caff482cc71b
parent 8acf72a7

core/java/com/android/internal/power/EnergyConsumerStats.java

deleted100644 → 0
+0 −700

File deleted.

Preview size limit exceeded, changes collapsed.

core/jni/com_android_internal_os_LongArrayMultiStateCounter.cpp

+5 −1
Original line number Diff line number Diff line
@@ -203,13 +203,17 @@ static jlong native_initFromParcel(JNIEnv *env, jclass, jobject jParcel) { 
    int32_t stateCount;

    THROW_AND_RETURN_ON_READ_ERROR(AParcel_readInt32(parcel.get(), &stateCount));



    if (stateCount < 0 || stateCount > 0xEFFF) {

    if (stateCount <= 0 || stateCount > 0xEFFF) {

        throwReadException(env, STATUS_INVALID_OPERATION);

        return 0L;

    }



    int32_t arrayLength;

    THROW_AND_RETURN_ON_READ_ERROR(AParcel_readInt32(parcel.get(), &arrayLength));

    if (arrayLength < 0 || arrayLength > 0xFFFFF) {

        throwReadException(env, STATUS_INVALID_OPERATION);

        return 0L;

    }



    auto counter =

            std::make_unique<LongArrayMultiStateCounter>(stateCount, Uint64Array(arrayLength));

core/tests/coretests/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -296,7 +296,6 @@ android_ravenwood_test { 
        "src/android/view/DisplayTest.java",

        "src/com/android/internal/logging/**/*.java",

        "src/com/android/internal/os/**/*.java",

        "src/com/android/internal/power/EnergyConsumerStatsTest.java",

        "src/com/android/internal/ravenwood/**/*.java",

        "src/com/android/internal/util/**/*.java",

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

+0 −4
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.internal.os;



import com.android.internal.power.EnergyConsumerStatsTest;



import org.junit.runner.RunWith;

import org.junit.runners.Suite;
@@ -37,8 +35,6 @@ import org.junit.runners.Suite; 
        MonotonicClockTest.class,

        PowerProfileTest.class,

        PowerStatsTest.class,



        EnergyConsumerStatsTest.class

    })

public class BatteryStatsTests {

}

core/tests/coretests/src/com/android/internal/power/EnergyConsumerStatsTest.java

deleted100644 → 0
+0 −588

File deleted.

Preview size limit exceeded, changes collapsed.