Merge "Fix the missing longwake finish event problem." into qt-dev (eb5532ea) · Commits · e / os / android_frameworks_base

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

+5 −4

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

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

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