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

Commit 6ccd3310 authored by zhuguangqing's avatar zhuguangqing Committed by android-build-merger
Browse files

Merge "Modify start/stop condition for mScreenDozeTimer." am: 83ed4883 

am: 8d8d85b9

Change-Id: Iec45a370c282d9622408a825cb11530e755a210f
parents d710ca39 8d8d85b9

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

+2 −2
Original line number Diff line number Diff line
@@ -4754,11 +4754,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;