Merge "Fix the missing longwake finish event problem." into qt-dev am: eb5532eac8 am: f832f61e1c (5bd549f1) · Commits · e / os / android_frameworks_base

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

+5 −4

Original line number	Diff line number	Diff line
		@@ -3607,8 +3607,8 @@ public class BatteryStatsImpl extends BatteryStats {

		public void createFakeHistoryEvents(long numEvents) {
		for(long i = 0; i < numEvents; i++) {
		noteWifiOnLocked();
		noteWifiOffLocked();
		noteLongPartialWakelockStart("name1", "historyName1", 1000);
		noteLongPartialWakelockFinish("name1", "historyName1", 1000);
		}
		}

		@@ -3691,9 +3691,10 @@ public class BatteryStatsImpl extends BatteryStats {
		mHistoryBufferLastPos = -1;
		final long elapsedRealtime = mClocks.elapsedRealtime();
		final long uptime = mClocks.uptimeMillis();
		HistoryItem newItem = new HistoryItem();
		newItem.setTo(cur);
		startRecordingHistory(elapsedRealtime, uptime, false);

		addHistoryBufferLocked(elapsedRealtimeMs, HistoryItem.CMD_UPDATE, cur);
		addHistoryBufferLocked(elapsedRealtimeMs, HistoryItem.CMD_UPDATE, newItem);
		return;
		}