Merge "Some improvements to battery stats data." (a985bfb4) · Commits · e / os / android_frameworks_base

core/java/android/os/BatteryStats.java

+35 −19

Original line number	Diff line number	Diff line
		@@ -152,7 +152,12 @@ public abstract class BatteryStats implements Parcelable {
		private static final String[] STAT_NAMES = { "l", "c", "u" };

		/**
		* Bump the version on this if the checkin format changes.
		* Current version of checkin data format.
		*/
		static final String CHECKIN_VERSION = "14";

		/**
		* Old version, we hit 9 and ran out of room, need to remove.
		*/
		private static final int BATTERY_STATS_CHECKIN_VERSION = 9;

		@@ -1055,22 +1060,23 @@ public abstract class BatteryStats implements Parcelable {
		public static final int STATE_GPS_ON_FLAG = 1<<29;
		public static final int STATE_WIFI_FULL_LOCK_FLAG = 1<<28;
		public static final int STATE_WIFI_SCAN_FLAG = 1<<27;
		public static final int STATE_WIFI_MULTICAST_ON_FLAG = 1<<26;
		public static final int STATE_WIFI_RADIO_ACTIVE_FLAG = 1<<26;
		public static final int STATE_MOBILE_RADIO_ACTIVE_FLAG = 1<<25;
		// These are on the lower bits used for the command; if they change
		// we need to write another int of data.
		public static final int STATE_SENSOR_ON_FLAG = 1<<23;
		public static final int STATE_AUDIO_ON_FLAG = 1<<22;
		public static final int STATE_PHONE_SCANNING_FLAG = 1<<21;
		public static final int STATE_SCREEN_ON_FLAG = 1<<20;
		public static final int STATE_BATTERY_PLUGGED_FLAG = 1<<19;
		public static final int STATE_PHONE_IN_CALL_FLAG = 1<<18;
		public static final int STATE_CHARGING_FLAG = 1<<17;
		public static final int STATE_BLUETOOTH_ON_FLAG = 1<<16;
		public static final int STATE_SCREEN_ON_FLAG = 1<<20; // consider moving to states2
		public static final int STATE_BATTERY_PLUGGED_FLAG = 1<<19; // consider moving to states2
		// empty slot
		// empty slot
		public static final int STATE_WIFI_MULTICAST_ON_FLAG = 1<<16;

		public static final int MOST_INTERESTING_STATES =
		STATE_BATTERY_PLUGGED_FLAG \| STATE_SCREEN_ON_FLAG
		\| STATE_PHONE_IN_CALL_FLAG \| STATE_BLUETOOTH_ON_FLAG;
		STATE_BATTERY_PLUGGED_FLAG \| STATE_SCREEN_ON_FLAG;

		public static final int SETTLE_TO_ZERO_STATES = 0xffff0000 & ~MOST_INTERESTING_STATES;

		public int states;

		@@ -1088,9 +1094,15 @@ public abstract class BatteryStats implements Parcelable {
		public static final int STATE2_WIFI_ON_FLAG = 1<<28;
		public static final int STATE2_FLASHLIGHT_FLAG = 1<<27;
		public static final int STATE2_DEVICE_IDLE_FLAG = 1<<26;
		public static final int STATE2_CHARGING_FLAG = 1<<25;
		public static final int STATE2_PHONE_IN_CALL_FLAG = 1<<24;
		public static final int STATE2_BLUETOOTH_ON_FLAG = 1<<23;

		public static final int MOST_INTERESTING_STATES2 =
		STATE2_POWER_SAVE_FLAG \| STATE2_WIFI_ON_FLAG \| STATE2_DEVICE_IDLE_FLAG;
		STATE2_POWER_SAVE_FLAG \| STATE2_WIFI_ON_FLAG \| STATE2_DEVICE_IDLE_FLAG
		\| STATE2_CHARGING_FLAG \| STATE2_PHONE_IN_CALL_FLAG \| STATE2_BLUETOOTH_ON_FLAG;

		public static final int SETTLE_TO_ZERO_STATES2 = 0xffff0000 & ~MOST_INTERESTING_STATES2;

		public int states2;

		@@ -1137,8 +1149,10 @@ public abstract class BatteryStats implements Parcelable {
		public static final int EVENT_PACKAGE_UNINSTALLED = 0x000d;
		// Event for a package being uninstalled.
		public static final int EVENT_ALARM = 0x000e;
		// Record that we have decided we need to collect new stats data.
		public static final int EVENT_COLLECT_EXTERNAL_STATS = 0x000f;
		// Number of event types.
		public static final int EVENT_COUNT = 0x000f;
		public static final int EVENT_COUNT = 0x0010;
		// Mask to extract out only the type part of the event.
		public static final int EVENT_TYPE_MASK = ~(EVENT_FLAG_START\|EVENT_FLAG_FINISH);

		@@ -1750,14 +1764,12 @@ public abstract class BatteryStats implements Parcelable {
		new BitDescription(HistoryItem.STATE_WIFI_FULL_LOCK_FLAG, "wifi_full_lock", "Wl"),
		new BitDescription(HistoryItem.STATE_WIFI_SCAN_FLAG, "wifi_scan", "Ws"),
		new BitDescription(HistoryItem.STATE_WIFI_MULTICAST_ON_FLAG, "wifi_multicast", "Wm"),
		new BitDescription(HistoryItem.STATE_WIFI_RADIO_ACTIVE_FLAG, "wifi_radio", "Wr"),
		new BitDescription(HistoryItem.STATE_MOBILE_RADIO_ACTIVE_FLAG, "mobile_radio", "Pr"),
		new BitDescription(HistoryItem.STATE_PHONE_SCANNING_FLAG, "phone_scanning", "Psc"),
		new BitDescription(HistoryItem.STATE_AUDIO_ON_FLAG, "audio", "a"),
		new BitDescription(HistoryItem.STATE_SCREEN_ON_FLAG, "screen", "S"),
		new BitDescription(HistoryItem.STATE_BATTERY_PLUGGED_FLAG, "plugged", "BP"),
		new BitDescription(HistoryItem.STATE_PHONE_IN_CALL_FLAG, "phone_in_call", "Pcl"),
		new BitDescription(HistoryItem.STATE_CHARGING_FLAG, "charging", "ch"),
		new BitDescription(HistoryItem.STATE_BLUETOOTH_ON_FLAG, "bluetooth", "b"),
		new BitDescription(HistoryItem.STATE_DATA_CONNECTION_MASK,
		HistoryItem.STATE_DATA_CONNECTION_SHIFT, "data_conn", "Pcn",
		DATA_CONNECTION_NAMES, DATA_CONNECTION_NAMES),
		@@ -1778,10 +1790,13 @@ public abstract class BatteryStats implements Parcelable {
		= new BitDescription[] {
		new BitDescription(HistoryItem.STATE2_POWER_SAVE_FLAG, "power_save", "ps"),
		new BitDescription(HistoryItem.STATE2_VIDEO_ON_FLAG, "video", "v"),
		new BitDescription(HistoryItem.STATE2_WIFI_RUNNING_FLAG, "wifi_running", "Wr"),
		new BitDescription(HistoryItem.STATE2_WIFI_RUNNING_FLAG, "wifi_running", "Ww"),
		new BitDescription(HistoryItem.STATE2_WIFI_ON_FLAG, "wifi", "W"),
		new BitDescription(HistoryItem.STATE2_FLASHLIGHT_FLAG, "flashlight", "fl"),
		new BitDescription(HistoryItem.STATE2_DEVICE_IDLE_FLAG, "device_idle", "di"),
		new BitDescription(HistoryItem.STATE2_CHARGING_FLAG, "charging", "ch"),
		new BitDescription(HistoryItem.STATE2_PHONE_IN_CALL_FLAG, "phone_in_call", "Pcl"),
		new BitDescription(HistoryItem.STATE2_BLUETOOTH_ON_FLAG, "bluetooth", "b"),
		new BitDescription(HistoryItem.STATE2_WIFI_SIGNAL_STRENGTH_MASK,
		HistoryItem.STATE2_WIFI_SIGNAL_STRENGTH_SHIFT, "wifi_signal_strength", "Wss",
		new String[] { "0", "1", "2", "3", "4" },
		@@ -1793,12 +1808,12 @@ public abstract class BatteryStats implements Parcelable {

		public static final String[] HISTORY_EVENT_NAMES = new String[] {
		"null", "proc", "fg", "top", "sync", "wake_lock_in", "job", "user", "userfg", "conn",
		"motion", "active", "pkginst", "pkgunin", "alarm"
		"motion", "active", "pkginst", "pkgunin", "alarm", "stats"
		};

		public static final String[] HISTORY_EVENT_CHECKIN_NAMES = new String[] {
		"Enl", "Epr", "Efg", "Etp", "Esy", "Ewl", "Ejb", "Eur", "Euf", "Ecn",
		"Esm", "Eac", "Epi", "Epu", "Eal"
		"Esm", "Eac", "Epi", "Epu", "Eal", "Est"
		};

		/**
		@@ -4883,7 +4898,8 @@ public abstract class BatteryStats implements Parcelable {
		prepareForDumpLocked();

		dumpLine(pw, 0 /* uid /, "i" / category */, VERSION_DATA,
		"13", getParcelVersion(), getStartPlatformVersion(), getEndPlatformVersion());
		CHECKIN_VERSION, getParcelVersion(), getStartPlatformVersion(),
		getEndPlatformVersion());

		long now = getHistoryBaseTime() + SystemClock.elapsedRealtime();

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

+80 −29

Original line number	Diff line number	Diff line
		@@ -107,7 +107,7 @@ public final class BatteryStatsImpl extends BatteryStats {
		private static final int MAGIC = 0xBA757475; // 'BATSTATS'

		// Current on-disk Parcel version
		private static final int VERSION = 123 + (USE_OLD_HISTORY ? 1000 : 0);
		private static final int VERSION = 124 + (USE_OLD_HISTORY ? 1000 : 0);

		// Maximum number of items we will record in the history.
		private static final int MAX_HISTORY_ITEMS = 2000;
		@@ -176,7 +176,7 @@ public final class BatteryStatsImpl extends BatteryStats {
		}

		public interface ExternalStatsSync {
		void scheduleSync();
		void scheduleSync(String reason);
		}

		public final MyHandler mHandler;
		@@ -250,6 +250,8 @@ public final class BatteryStatsImpl extends BatteryStats {
		int mNumHistoryTagChars = 0;
		int mHistoryBufferLastPos = -1;
		boolean mHistoryOverflow = false;
		int mActiveHistoryStates = 0xffffffff;
		int mActiveHistoryStates2 = 0xffffffff;
		long mLastHistoryElapsedRealtime = 0;
		long mTrackRunningHistoryElapsedRealtime = 0;
		long mTrackRunningHistoryUptime = 0;
		@@ -313,7 +315,7 @@ public final class BatteryStatsImpl extends BatteryStats {

		int mWakeLockNesting;
		boolean mWakeLockImportant;
		boolean mRecordAllHistory;
		public boolean mRecordAllHistory;
		boolean mNoAutoReset;

		int mScreenState = Display.STATE_UNKNOWN;
		@@ -398,6 +400,8 @@ public final class BatteryStatsImpl extends BatteryStats {
		LongSamplingCounter mMobileRadioActiveUnknownTime;
		LongSamplingCounter mMobileRadioActiveUnknownCount;

		int mWifiRadioPowerState = DataConnectionRealTimeInfo.DC_POWER_STATE_LOW;

		/** Bluetooth headset object */
		BluetoothHeadset mBtHeadset;

		@@ -2259,8 +2263,8 @@ public final class BatteryStatsImpl extends BatteryStats {
		}

		final long timeDiff = (mHistoryBaseTime+elapsedRealtimeMs) - mHistoryLastWritten.time;
		final int diffStates = mHistoryLastWritten.states^cur.states;
		final int diffStates2 = mHistoryLastWritten.states2^cur.states2;
		final int diffStates = mHistoryLastWritten.states^(cur.states&mActiveHistoryStates);
		final int diffStates2 = mHistoryLastWritten.states2^(cur.states2&mActiveHistoryStates2);
		final int lastDiffStates = mHistoryLastWritten.states^mHistoryLastLastWritten.states;
		final int lastDiffStates2 = mHistoryLastWritten.states2^mHistoryLastLastWritten.states2;
		if (DEBUG) Slog.i(TAG, "ADD: tdelta=" + timeDiff + " diff="
		@@ -2325,11 +2329,32 @@ public final class BatteryStatsImpl extends BatteryStats {
		return;
		}

		// After overflow, we allow various bit-wise states to settle to 0.
		boolean writeAnyway = false;
		final int curStates = cur.states & HistoryItem.SETTLE_TO_ZERO_STATES
		& mActiveHistoryStates;
		if (mHistoryLastWritten.states != curStates) {
		// mActiveHistoryStates keeps track of which bits in .states are now being
		// forced to 0.
		int old = mActiveHistoryStates;
		mActiveHistoryStates &= curStates \| ~HistoryItem.SETTLE_TO_ZERO_STATES;
		writeAnyway \|= old != mActiveHistoryStates;
		}
		final int curStates2 = cur.states2 & HistoryItem.SETTLE_TO_ZERO_STATES2
		& mActiveHistoryStates2;
		if (mHistoryLastWritten.states2 != curStates2) {
		// mActiveHistoryStates2 keeps track of which bits in .states2 are now being
		// forced to 0.
		int old = mActiveHistoryStates2;
		mActiveHistoryStates2 &= curStates2 \| ~HistoryItem.SETTLE_TO_ZERO_STATES2;
		writeAnyway \|= old != mActiveHistoryStates2;
		}

		// Once we've reached the maximum number of items, we only
		// record changes to the battery level and the most interesting states.
		// Once we've reached the maximum maximum number of items, we only
		// record changes to the battery level.
		if (mHistoryLastWritten.batteryLevel == cur.batteryLevel &&
		if (!writeAnyway && mHistoryLastWritten.batteryLevel == cur.batteryLevel &&
		(dataSize >= MAX_MAX_HISTORY_BUFFER
		\|\| ((mHistoryLastWritten.states^cur.states)
		& HistoryItem.MOST_INTERESTING_STATES) == 0
		@@ -2360,6 +2385,8 @@ public final class BatteryStatsImpl extends BatteryStats {
		mHistoryBufferLastPos = mHistoryBuffer.dataPosition();
		mHistoryLastLastWritten.setTo(mHistoryLastWritten);
		mHistoryLastWritten.setTo(mHistoryBaseTime + elapsedRealtimeMs, cmd, cur);
		mHistoryLastWritten.states &= mActiveHistoryStates;
		mHistoryLastWritten.states2 &= mActiveHistoryStates2;
		writeHistoryDelta(mHistoryBuffer, mHistoryLastWritten, mHistoryLastLastWritten);
		mLastHistoryElapsedRealtime = elapsedRealtimeMs;
		cur.wakelockTag = null;
		@@ -2411,8 +2438,8 @@ public final class BatteryStatsImpl extends BatteryStats {
		// into one record.
		if (mHistoryEnd != null && mHistoryEnd.cmd == HistoryItem.CMD_UPDATE
		&& (mHistoryBaseTime+elapsedRealtimeMs) < (mHistoryEnd.time+1000)
		&& ((mHistoryEnd.states^cur.states)&mChangedStates) == 0
		&& ((mHistoryEnd.states2^cur.states2)&mChangedStates2) == 0) {
		&& ((mHistoryEnd.states^cur.states)&mChangedStates&mActiveHistoryStates) == 0
		&& ((mHistoryEnd.states2^cur.states2)&mChangedStates2&mActiveHistoryStates2) == 0) {
		// If the current is the same as the one before, then we no
		// longer need the entry.
		if (mHistoryLastEnd != null && mHistoryLastEnd.cmd == HistoryItem.CMD_UPDATE
		@@ -2424,8 +2451,8 @@ public final class BatteryStatsImpl extends BatteryStats {
		mHistoryEnd = mHistoryLastEnd;
		mHistoryLastEnd = null;
		} else {
		mChangedStates \|= mHistoryEnd.states^cur.states;
		mChangedStates2 \|= mHistoryEnd.states^cur.states2;
		mChangedStates \|= mHistoryEnd.states^(cur.states&mActiveHistoryStates);
		mChangedStates2 \|= mHistoryEnd.states^(cur.states2&mActiveHistoryStates2);
		mHistoryEnd.setTo(mHistoryEnd.time, HistoryItem.CMD_UPDATE, cur);
		}
		return;
		@@ -2447,7 +2474,7 @@ public final class BatteryStatsImpl extends BatteryStats {
		if (mHistoryEnd != null && mHistoryEnd.batteryLevel
		== cur.batteryLevel &&
		(mNumHistoryItems >= MAX_MAX_HISTORY_ITEMS
		\|\| ((mHistoryEnd.states^cur.states)
		\|\| ((mHistoryEnd.states^(cur.states&mActiveHistoryStates))
		& HistoryItem.MOST_INTERESTING_STATES) == 0)) {
		return;
		}
		@@ -2456,7 +2483,7 @@ public final class BatteryStatsImpl extends BatteryStats {
		addHistoryRecordLocked(elapsedRealtimeMs, HistoryItem.CMD_UPDATE);
		}

		void addHistoryEventLocked(long elapsedRealtimeMs, long uptimeMs, int code,
		public void addHistoryEventLocked(long elapsedRealtimeMs, long uptimeMs, int code,
		String name, int uid) {
		mHistoryCur.eventCode = code;
		mHistoryCur.eventTag = mHistoryCur.localEventTag;
		@@ -2515,6 +2542,8 @@ public final class BatteryStatsImpl extends BatteryStats {
		mNumHistoryTagChars = 0;
		mHistoryBufferLastPos = -1;
		mHistoryOverflow = false;
		mActiveHistoryStates = 0xffffffff;
		mActiveHistoryStates2 = 0xffffffff;
		mLastRecordedClockTime = 0;
		mLastRecordedClockRealtime = 0;
		}
		@@ -3396,7 +3425,7 @@ public final class BatteryStatsImpl extends BatteryStats {
		if (!mPhoneOn) {
		final long elapsedRealtime = SystemClock.elapsedRealtime();
		final long uptime = SystemClock.uptimeMillis();
		mHistoryCur.states \|= HistoryItem.STATE_PHONE_IN_CALL_FLAG;
		mHistoryCur.states2 \|= HistoryItem.STATE2_PHONE_IN_CALL_FLAG;
		if (DEBUG_HISTORY) Slog.v(TAG, "Phone on to: "
		+ Integer.toHexString(mHistoryCur.states));
		addHistoryRecordLocked(elapsedRealtime, uptime);
		@@ -3409,7 +3438,7 @@ public final class BatteryStatsImpl extends BatteryStats {
		if (mPhoneOn) {
		final long elapsedRealtime = SystemClock.elapsedRealtime();
		final long uptime = SystemClock.uptimeMillis();
		mHistoryCur.states &= ~HistoryItem.STATE_PHONE_IN_CALL_FLAG;
		mHistoryCur.states2 &= ~HistoryItem.STATE2_PHONE_IN_CALL_FLAG;
		if (DEBUG_HISTORY) Slog.v(TAG, "Phone off to: "
		+ Integer.toHexString(mHistoryCur.states));
		addHistoryRecordLocked(elapsedRealtime, uptime);
		@@ -3626,7 +3655,7 @@ public final class BatteryStatsImpl extends BatteryStats {
		addHistoryRecordLocked(elapsedRealtime, uptime);
		mWifiOn = true;
		mWifiOnTimer.startRunningLocked(elapsedRealtime);
		scheduleSyncExternalStatsLocked();
		scheduleSyncExternalStatsLocked("wifi-off");
		}
		}

		@@ -3640,7 +3669,7 @@ public final class BatteryStatsImpl extends BatteryStats {
		addHistoryRecordLocked(elapsedRealtime, uptime);
		mWifiOn = false;
		mWifiOnTimer.stopRunningLocked(elapsedRealtime);
		scheduleSyncExternalStatsLocked();
		scheduleSyncExternalStatsLocked("wifi-on");
		}
		}

		@@ -3788,6 +3817,25 @@ public final class BatteryStatsImpl extends BatteryStats {
		}
		}

		public void noteWifiRadioPowerState(int powerState, long timestampNs) {
		final long elapsedRealtime = SystemClock.elapsedRealtime();
		final long uptime = SystemClock.uptimeMillis();
		if (mWifiRadioPowerState != powerState) {
		final boolean active =
		powerState == DataConnectionRealTimeInfo.DC_POWER_STATE_MEDIUM
		\|\| powerState == DataConnectionRealTimeInfo.DC_POWER_STATE_HIGH;
		if (active) {
		mHistoryCur.states \|= HistoryItem.STATE_WIFI_RADIO_ACTIVE_FLAG;
		} else {
		mHistoryCur.states &= ~HistoryItem.STATE_WIFI_RADIO_ACTIVE_FLAG;
		}
		if (DEBUG_HISTORY) Slog.v(TAG, "Wifi network active " + active + " to: "
		+ Integer.toHexString(mHistoryCur.states));
		addHistoryRecordLocked(elapsedRealtime, uptime);
		mWifiRadioPowerState = powerState;
		}
		}

		public void noteWifiRunningLocked(WorkSource ws) {
		if (!mGlobalWifiRunning) {
		final long elapsedRealtime = SystemClock.elapsedRealtime();
		@@ -3803,7 +3851,7 @@ public final class BatteryStatsImpl extends BatteryStats {
		int uid = mapUid(ws.get(i));
		getUidStatsLocked(uid).noteWifiRunningLocked(elapsedRealtime);
		}
		scheduleSyncExternalStatsLocked();
		scheduleSyncExternalStatsLocked("wifi-running");
		} else {
		Log.w(TAG, "noteWifiRunningLocked -- called while WIFI running");
		}
		@@ -3842,7 +3890,7 @@ public final class BatteryStatsImpl extends BatteryStats {
		int uid = mapUid(ws.get(i));
		getUidStatsLocked(uid).noteWifiStoppedLocked(elapsedRealtime);
		}
		scheduleSyncExternalStatsLocked();
		scheduleSyncExternalStatsLocked("wifi-stopped");
		} else {
		Log.w(TAG, "noteWifiStoppedLocked -- called while WIFI not running");
		}
		@@ -3857,7 +3905,7 @@ public final class BatteryStatsImpl extends BatteryStats {
		}
		mWifiState = wifiState;
		mWifiStateTimer[wifiState].startRunningLocked(elapsedRealtime);
		scheduleSyncExternalStatsLocked();
		scheduleSyncExternalStatsLocked("wifi-state");
		}
		}

		@@ -3923,13 +3971,13 @@ public final class BatteryStatsImpl extends BatteryStats {
		if (!mBluetoothOn) {
		final long elapsedRealtime = SystemClock.elapsedRealtime();
		final long uptime = SystemClock.uptimeMillis();
		mHistoryCur.states \|= HistoryItem.STATE_BLUETOOTH_ON_FLAG;
		mHistoryCur.states2 \|= HistoryItem.STATE2_BLUETOOTH_ON_FLAG;
		if (DEBUG_HISTORY) Slog.v(TAG, "Bluetooth on to: "
		+ Integer.toHexString(mHistoryCur.states));
		addHistoryRecordLocked(elapsedRealtime, uptime);
		mBluetoothOn = true;
		mBluetoothOnTimer.startRunningLocked(elapsedRealtime);
		scheduleSyncExternalStatsLocked();
		scheduleSyncExternalStatsLocked("bluetooth-on");
		}
		}

		@@ -3937,13 +3985,13 @@ public final class BatteryStatsImpl extends BatteryStats {
		if (mBluetoothOn) {
		final long elapsedRealtime = SystemClock.elapsedRealtime();
		final long uptime = SystemClock.uptimeMillis();
		mHistoryCur.states &= ~HistoryItem.STATE_BLUETOOTH_ON_FLAG;
		mHistoryCur.states2 &= ~HistoryItem.STATE2_BLUETOOTH_ON_FLAG;
		if (DEBUG_HISTORY) Slog.v(TAG, "Bluetooth off to: "
		+ Integer.toHexString(mHistoryCur.states));
		addHistoryRecordLocked(elapsedRealtime, uptime);
		mBluetoothOn = false;
		mBluetoothOnTimer.stopRunningLocked(elapsedRealtime);
		scheduleSyncExternalStatsLocked();
		scheduleSyncExternalStatsLocked("bluetooth-off");
		}
		}

		@@ -7871,9 +7919,9 @@ public final class BatteryStatsImpl extends BatteryStats {
		if (mCharging != charging) {
		mCharging = charging;
		if (charging) {
		mHistoryCur.states \|= HistoryItem.STATE_CHARGING_FLAG;
		mHistoryCur.states2 \|= HistoryItem.STATE2_CHARGING_FLAG;
		} else {
		mHistoryCur.states &= ~HistoryItem.STATE_CHARGING_FLAG;
		mHistoryCur.states2 &= ~HistoryItem.STATE2_CHARGING_FLAG;
		}
		mHandler.sendEmptyMessage(MSG_REPORT_CHARGING);
		return true;
		@@ -8039,9 +8087,9 @@ public final class BatteryStatsImpl extends BatteryStats {
		}
		}

		private void scheduleSyncExternalStatsLocked() {
		private void scheduleSyncExternalStatsLocked(String reason) {
		if (mExternalSync != null) {
		mExternalSync.scheduleSync();
		mExternalSync.scheduleSync(reason);
		}
		}

		@@ -8067,7 +8115,7 @@ public final class BatteryStatsImpl extends BatteryStats {
		}
		}
		// Always start out assuming charging, that will be updated later.
		mHistoryCur.states \|= HistoryItem.STATE_CHARGING_FLAG;
		mHistoryCur.states2 \|= HistoryItem.STATE2_CHARGING_FLAG;
		mHistoryCur.batteryStatus = (byte)status;
		mHistoryCur.batteryLevel = (byte)level;
		mMaxChargeStepLevel = mMinDischargeStepLevel =
		@@ -8109,7 +8157,7 @@ public final class BatteryStatsImpl extends BatteryStats {

		// TODO(adamlesinski): Schedule the creation of a HistoryStepDetails record
		// which will pull external stats.
		scheduleSyncExternalStatsLocked();
		scheduleSyncExternalStatsLocked("battery-level");
		}
		if (mHistoryCur.batteryStatus != status) {
		mHistoryCur.batteryStatus = (byte)status;
		@@ -8910,6 +8958,7 @@ public final class BatteryStatsImpl extends BatteryStats {
		mMobileRadioActiveAdjustedTime.readSummaryFromParcelLocked(in);
		mMobileRadioActiveUnknownTime.readSummaryFromParcelLocked(in);
		mMobileRadioActiveUnknownCount.readSummaryFromParcelLocked(in);
		mWifiRadioPowerState = DataConnectionRealTimeInfo.DC_POWER_STATE_LOW;
		mWifiOn = false;
		mWifiOnTimer.readSummaryFromParcelLocked(in);
		mGlobalWifiRunning = false;
		@@ -9542,6 +9591,7 @@ public final class BatteryStatsImpl extends BatteryStats {
		mMobileRadioActiveAdjustedTime = new LongSamplingCounter(mOnBatteryTimeBase, in);
		mMobileRadioActiveUnknownTime = new LongSamplingCounter(mOnBatteryTimeBase, in);
		mMobileRadioActiveUnknownCount = new LongSamplingCounter(mOnBatteryTimeBase, in);
		mWifiRadioPowerState = DataConnectionRealTimeInfo.DC_POWER_STATE_LOW;
		mWifiOn = false;
		mWifiOnTimer = new StopwatchTimer(null, -4, null, mOnBatteryTimeBase, in);
		mGlobalWifiRunning = false;
		@@ -9851,6 +9901,7 @@ public final class BatteryStatsImpl extends BatteryStats {
		mMobileRadioActiveTimer.logState(pr, " ");
		pr.println("*** Mobile network active adjusted timer:");
		mMobileRadioActiveAdjustedTime.logState(pr, " ");
		pr.println("*** mWifiRadioPowerState=" + mWifiRadioPowerState);
		pr.println("*** Wifi timer:");
		mWifiOnTimer.logState(pr, " ");
		pr.println("*** WifiRunning timer:");

services/core/java/com/android/server/am/BatteryStatsService.java

+23 −13

File changed.

Preview size limit exceeded, changes collapsed.