Merge "Modify start/stop condition for mScreenDozeTimer."

am: 83ed488383

Change-Id: I12ff8f6860a60519a9b029010fa1078d47ccfc25
This commit is contained in:
zhuguangqing
2019-08-20 18:22:19 -07:00
committed by android-build-merger

View File

@@ -4754,11 +4754,11 @@ public class BatteryStatsImpl extends BatteryStats {
final long uptime = mClocks.uptimeMillis(); final long uptime = mClocks.uptimeMillis();
boolean updateHistory = false; boolean updateHistory = false;
if (isScreenDoze(state)) { if (isScreenDoze(state) && !isScreenDoze(oldState)) {
mHistoryCur.states |= HistoryItem.STATE_SCREEN_DOZE_FLAG; mHistoryCur.states |= HistoryItem.STATE_SCREEN_DOZE_FLAG;
mScreenDozeTimer.startRunningLocked(elapsedRealtime); mScreenDozeTimer.startRunningLocked(elapsedRealtime);
updateHistory = true; updateHistory = true;
} else if (isScreenDoze(oldState)) { } else if (isScreenDoze(oldState) && !isScreenDoze(state)) {
mHistoryCur.states &= ~HistoryItem.STATE_SCREEN_DOZE_FLAG; mHistoryCur.states &= ~HistoryItem.STATE_SCREEN_DOZE_FLAG;
mScreenDozeTimer.stopRunningLocked(elapsedRealtime); mScreenDozeTimer.stopRunningLocked(elapsedRealtime);
updateHistory = true; updateHistory = true;