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

Commit f6743c03 authored by Hui Yu's avatar Hui Yu Committed by Automerger Merge Worker
Browse files

Merge "Fix the missing history event problem." into tm-dev am: 25019b37 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18582121



Change-Id: I2a47c4030779112265d957fe58f90136aa0c7831
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d8aa1435 25019b37

core/java/com/android/internal/os/BatteryStatsImpl.java

+6 −3
Original line number Diff line number Diff line
@@ -4503,10 +4503,13 @@ public class BatteryStatsImpl extends BatteryStats { 
            for (Map.Entry<HistoryTag, Integer> entry: mHistoryTagPool.entrySet()) {

                entry.setValue(entry.getValue() | TAG_FIRST_OCCURRENCE_FLAG);

            }

            // Make a copy of mHistoryCur.

            HistoryItem copy = new HistoryItem();

            copy.setTo(cur);

            // startRecordingHistory will reset mHistoryCur.

            startRecordingHistory(elapsedRealtimeMs, uptimeMs, false);

            HistoryItem newItem = new HistoryItem();

            newItem.setTo(cur);

            addHistoryBufferLocked(elapsedRealtimeMs, HistoryItem.CMD_UPDATE, newItem);

            // Add the copy into history buffer.

            addHistoryBufferLocked(elapsedRealtimeMs, HistoryItem.CMD_UPDATE, copy);

            return;

        }

































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



+9
−7




























Original line number
Diff line number
Diff line








@@ -154,19 +154,21 @@ public class BatteryStatsHistoryIteratorTest {





























        for (int i = 0; i < eventCount; i++) {















            String name = "a" + (i % 10);













            do {















                assertThat(iterator.next(item)).isTrue();















                // Skip a blank event inserted at the start of every buffer













            if (item.eventCode == BatteryStats.HistoryItem.EVENT_NONE) {













                assertThat(iterator.next(item)).isTrue();













            }













            } while (item.cmd != BatteryStats.HistoryItem.CMD_UPDATE













                    || item.eventCode == BatteryStats.HistoryItem.EVENT_NONE);





























            assertThat(item.eventCode).isEqualTo(BatteryStats.HistoryItem.EVENT_ALARM















                    | BatteryStats.HistoryItem.EVENT_FLAG_START);















            assertThat(item.eventTag.string).isEqualTo(name);





























            do {















                assertThat(iterator.next(item)).isTrue();













            if (item.eventCode == BatteryStats.HistoryItem.EVENT_NONE) {













                assertThat(iterator.next(item)).isTrue();













            }













            } while (item.cmd != BatteryStats.HistoryItem.CMD_UPDATE













                    || item.eventCode == BatteryStats.HistoryItem.EVENT_NONE);





























            assertThat(item.eventCode).isEqualTo(BatteryStats.HistoryItem.EVENT_ALARM















                    | BatteryStats.HistoryItem.EVENT_FLAG_FINISH);















            assertThat(item.eventTag.string).isEqualTo(name);