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

Commit 52448a22 authored by zhuguangqing's avatar zhuguangqing Committed by android-build-merger
Browse files

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

Merge "Modify start/stop condition for mScreenDozeTimer." am: 83ed4883 am: 8d8d85b9 am: 6ccd3310 am: 2fc30b6e
am: cc437bf6

Change-Id: I8f0a725630b9f79d3c91245b91fd630b2668dd58
parents a02cf979 cc437bf6

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

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