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

Commit c7c82de7 authored by YK Hung's avatar YK Hung Committed by Android (Google) Code Review
Browse files

Merge "Fix full-charge timestamp lost in battery chart graph." into main

parents 748cf7d7 feaf08a9

src/com/android/settings/fuelgauge/batteryusage/db/BatteryEventDao.java

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ public interface BatteryEventDao { 


    /** Gets the {@link Cursor} of all recorded data after a specific timestamp. */

    @Query("SELECT * FROM BatteryEventEntity"

            + " WHERE timestamp > :timestamp AND batteryEventType IN (:batteryEventTypes)"

            + " WHERE timestamp >= :timestamp AND batteryEventType IN (:batteryEventTypes)"

            + " ORDER BY timestamp DESC")

    Cursor getAllAfter(long timestamp, List<Integer> batteryEventTypes);

tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/BatteryEventDaoTest.java

+27 −0
Original line number Diff line number Diff line
@@ -149,4 +149,31 @@ public final class BatteryEventDaoTest { 
        mBatteryEventDao.clearAll();

        assertThat(mBatteryEventDao.getAll()).isEmpty();

    }



    @Test

    public void getAllAfter_filterTimestamp_returnExpectedResult() {

        mBatteryEventDao.insert(BatteryEventEntity.newBuilder()

                .setTimestamp(100L)

                .setBatteryEventType(1)

                .setBatteryLevel(66)

                .build());

        mBatteryEventDao.insert(BatteryEventEntity.newBuilder()

                .setTimestamp(200L)

                .setBatteryEventType(1)

                .setBatteryLevel(88)

                .build());



        final Cursor cursor = mBatteryEventDao.getAllAfter(200L, List.of(1));

        assertThat(cursor.getCount()).isEqualTo(1);

        cursor.moveToFirst();

        assertThat(cursor.getLong(cursor.getColumnIndex(KEY_TIMESTAMP)))

                .isEqualTo(200L);

        assertThat(cursor.getInt(cursor.getColumnIndex(KEY_BATTERY_EVENT_TYPE)))

                .isEqualTo(1);

        assertThat(cursor.getInt(cursor.getColumnIndex(KEY_BATTERY_LEVEL)))

                .isEqualTo(88);



        mBatteryEventDao.clearAll();

        assertThat(mBatteryEventDao.getAll()).isEmpty();

    }

}