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

Commit af0036ab authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-16.0' into v1-pie

parents bca756e0 e740651c

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

+2 −2
Original line number Diff line number Diff line
@@ -4919,11 +4919,11 @@ public class BatteryStatsImpl extends BatteryStats { 
            final long uptime = mClocks.uptimeMillis();















            boolean updateHistory = false;













            if (isScreenDoze(state)) {













            if (isScreenDoze(state) && !isScreenDoze(oldState)) {















                mHistoryCur.states |= HistoryItem.STATE_SCREEN_DOZE_FLAG;















                mScreenDozeTimer.startRunningLocked(elapsedRealtime);















                updateHistory = true;













            } else if (isScreenDoze(oldState)) {













            } else if (isScreenDoze(oldState) && !isScreenDoze(state)) {















                mHistoryCur.states &= ~HistoryItem.STATE_SCREEN_DOZE_FLAG;















                mScreenDozeTimer.stopRunningLocked(elapsedRealtime);















                updateHistory = true;