Merge "Battery stats: wake locks, radio active, cleanup." (43111e89) · Commits · e / os / android_frameworks_base

core/java/android/os/BatteryStats.java

+2 −7

Original line number	Diff line number	Diff line
		@@ -117,20 +117,15 @@ public abstract class BatteryStats implements Parcelable {
		*/
		public static final int STATS_SINCE_CHARGED = 0;

		/**
		* Include only the last run in the stats.
		*/
		public static final int STATS_LAST = 1;

		/**
		* Include only the current run in the stats.
		*/
		public static final int STATS_CURRENT = 2;
		public static final int STATS_CURRENT = 1;

		/**
		* Include only the run since the last time the device was unplugged in the stats.
		*/
		public static final int STATS_SINCE_UNPLUGGED = 3;
		public static final int STATS_SINCE_UNPLUGGED = 2;

		// NOTE: Update this list if you add/change any stats above.
		// These characters are supposed to represent "total", "last", "current",

core/java/android/os/IPowerManager.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@ interface IPowerManager
		void releaseWakeLock(IBinder lock, int flags);
		void updateWakeLockUids(IBinder lock, in int[] uids);

		void updateWakeLockWorkSource(IBinder lock, in WorkSource ws);
		void updateWakeLockWorkSource(IBinder lock, in WorkSource ws, String historyTag);
		boolean isWakeLockLevelSupported(int level);

		void userActivity(long time, int event, int flags);

core/java/android/os/PowerManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -844,7 +844,7 @@ public final class PowerManager {

		if (changed && mHeld) {
		try {
		mService.updateWakeLockWorkSource(mToken, mWorkSource);
		mService.updateWakeLockWorkSource(mToken, mWorkSource, mHistoryTag);
		} catch (RemoteException e) {
		}
		}

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

+69 −148

Original line number	Diff line number	Diff line
		@@ -230,10 +230,8 @@ public final class BatteryStatsImpl extends BatteryStats {

		long mUptime;
		long mUptimeStart;
		long mLastUptime;
		long mRealtime;
		long mRealtimeStart;
		long mLastRealtime;

		int mWakeLockNesting;
		boolean mWakeLockImportant;
		@@ -408,9 +406,7 @@ public final class BatteryStatsImpl extends BatteryStats {
		private final ArrayList<TimeBaseObs> mObservers = new ArrayList<TimeBaseObs>();

		private long mUptime;
		private long mLastUptime;
		private long mRealtime;
		private long mLastRealtime;

		private boolean mRunning;

		@@ -427,14 +423,12 @@ public final class BatteryStatsImpl extends BatteryStats {
		sb.setLength(0);
		sb.append(prefix);
		sb.append("mUptime=");
		formatTimeMs(sb, mUptime / 1000); sb.append("mLastUptime=");
		formatTimeMs(sb, mLastUptime / 1000);
		formatTimeMs(sb, mUptime / 1000);
		pw.println(sb.toString());
		sb.setLength(0);
		sb.append(prefix);
		sb.append("mRealtime=");
		formatTimeMs(sb, mRealtime / 1000); sb.append("mLastRealtime=");
		formatTimeMs(sb, mLastRealtime / 1000);
		formatTimeMs(sb, mRealtime / 1000);
		pw.println(sb.toString());
		sb.setLength(0);
		sb.append(prefix);
		@@ -489,8 +483,6 @@ public final class BatteryStatsImpl extends BatteryStats {
		switch (which) {
		case STATS_SINCE_CHARGED:
		return mUptime + getUptime(curTime);
		case STATS_LAST:
		return mLastUptime;
		case STATS_CURRENT:
		return getUptime(curTime);
		case STATS_SINCE_UNPLUGGED:
		@@ -503,8 +495,6 @@ public final class BatteryStatsImpl extends BatteryStats {
		switch (which) {
		case STATS_SINCE_CHARGED:
		return mRealtime + getRealtime(curTime);
		case STATS_LAST:
		return mLastRealtime;
		case STATS_CURRENT:
		return getRealtime(curTime);
		case STATS_SINCE_UNPLUGGED:
		@@ -582,7 +572,6 @@ public final class BatteryStatsImpl extends BatteryStats {
		public void readFromParcel(Parcel in) {
		mRunning = false;
		mUptime = in.readLong();
		mLastUptime = 0;
		mPastUptime = in.readLong();
		mUptimeStart = in.readLong();
		mPastRealtime = in.readLong();
		@@ -663,17 +652,12 @@ public final class BatteryStatsImpl extends BatteryStats {

		@Override
		public int getCountLocked(int which) {
		int val;
		if (which == STATS_LAST) {
		val = mLastCount;
		} else {
		val = mCount.get();
		int val = mCount.get();
		if (which == STATS_SINCE_UNPLUGGED) {
		val -= mUnpluggedCount;
		} else if (which != STATS_SINCE_CHARGED) {
		val -= mLoadedCount;
		}
		}

		return val;
		}
		@@ -772,17 +756,12 @@ public final class BatteryStatsImpl extends BatteryStats {
		}

		public long getCountLocked(int which) {
		long val;
		if (which == STATS_LAST) {
		val = mLastCount;
		} else {
		val = mCount;
		long val = mCount;
		if (which == STATS_SINCE_UNPLUGGED) {
		val -= mUnpluggedCount;
		} else if (which != STATS_SINCE_CHARGED) {
		val -= mLoadedCount;
		}
		}

		return val;
		}
		@@ -970,34 +949,24 @@ public final class BatteryStatsImpl extends BatteryStats {

		@Override
		public long getTotalTimeLocked(long elapsedRealtimeUs, int which) {
		long val;
		if (which == STATS_LAST) {
		val = mLastTime;
		} else {
		val = computeRunTimeLocked(mTimeBase.getRealtime(elapsedRealtimeUs));
		long val = computeRunTimeLocked(mTimeBase.getRealtime(elapsedRealtimeUs));
		if (which == STATS_SINCE_UNPLUGGED) {
		val -= mUnpluggedTime;
		} else if (which != STATS_SINCE_CHARGED) {
		val -= mLoadedTime;
		}
		}

		return val;
		}

		@Override
		public int getCountLocked(int which) {
		int val;
		if (which == STATS_LAST) {
		val = mLastCount;
		} else {
		val = computeCurrentCountLocked();
		int val = computeCurrentCountLocked();
		if (which == STATS_SINCE_UNPLUGGED) {
		val -= mUnpluggedCount;
		} else if (which != STATS_SINCE_CHARGED) {
		val -= mLoadedCount;
		}
		}

		return val;
		}
		@@ -2209,8 +2178,7 @@ public final class BatteryStatsImpl extends BatteryStats {
		mHistoryCur.eventTag = mHistoryCur.localEventTag;
		mHistoryCur.eventTag.string = name;
		mHistoryCur.eventTag.uid = uid;
		// XXX should be calling addHistoryRecordLocked()?
		addHistoryBufferLocked(elapsedRealtimeMs, uptimeMs, mHistoryCur);
		addHistoryRecordLocked(elapsedRealtimeMs, uptimeMs);
		}

		void addHistoryRecordLocked(long elapsedRealtimeMs, long uptimeMs, byte cmd, HistoryItem cur) {
		@@ -2797,8 +2765,8 @@ public final class BatteryStatsImpl extends BatteryStats {
		mMobileRadioActivePerAppTimer.startRunningLocked(elapsedRealtime);
		} else {
		mMobileRadioActiveTimer.stopRunningLocked(realElapsedRealtimeMs);
		mMobileRadioActivePerAppTimer.stopRunningLocked(realElapsedRealtimeMs);
		updateNetworkActivityLocked(NET_UPDATE_MOBILE, realElapsedRealtimeMs);
		mMobileRadioActivePerAppTimer.stopRunningLocked(realElapsedRealtimeMs);
		}
		}
		}
		@@ -4890,65 +4858,45 @@ public final class BatteryStatsImpl extends BatteryStats {

		@Override
		public long getUserTime(int which) {
		long val;
		if (which == STATS_LAST) {
		val = mLastUserTime;
		} else {
		val = mUserTime;
		long val = mUserTime;
		if (which == STATS_CURRENT) {
		val -= mLoadedUserTime;
		} else if (which == STATS_SINCE_UNPLUGGED) {
		val -= mUnpluggedUserTime;
		}
		}
		return val;
		}

		@Override
		public long getSystemTime(int which) {
		long val;
		if (which == STATS_LAST) {
		val = mLastSystemTime;
		} else {
		val = mSystemTime;
		long val = mSystemTime;
		if (which == STATS_CURRENT) {
		val -= mLoadedSystemTime;
		} else if (which == STATS_SINCE_UNPLUGGED) {
		val -= mUnpluggedSystemTime;
		}
		}
		return val;
		}

		@Override
		public long getForegroundTime(int which) {
		long val;
		if (which == STATS_LAST) {
		val = mLastForegroundTime;
		} else {
		val = mForegroundTime;
		long val = mForegroundTime;
		if (which == STATS_CURRENT) {
		val -= mLoadedForegroundTime;
		} else if (which == STATS_SINCE_UNPLUGGED) {
		val -= mUnpluggedForegroundTime;
		}
		}
		return val;
		}

		@Override
		public int getStarts(int which) {
		int val;
		if (which == STATS_LAST) {
		val = mLastStarts;
		} else {
		val = mStarts;
		int val = mStarts;
		if (which == STATS_CURRENT) {
		val -= mLoadedStarts;
		} else if (which == STATS_SINCE_UNPLUGGED) {
		val -= mUnpluggedStarts;
		}
		}
		return val;
		}

		@@ -5063,17 +5011,12 @@ public final class BatteryStatsImpl extends BatteryStats {

		@Override
		public int getWakeups(int which) {
		int val;
		if (which == STATS_LAST) {
		val = mLastWakeups;
		} else {
		val = mWakeups;
		int val = mWakeups;
		if (which == STATS_CURRENT) {
		val -= mLoadedWakeups;
		} else if (which == STATS_SINCE_UNPLUGGED) {
		val -= mUnpluggedWakeups;
		}
		}

		return val;
		}
		@@ -5284,52 +5227,34 @@ public final class BatteryStatsImpl extends BatteryStats {

		@Override
		public int getLaunches(int which) {
		int val;

		if (which == STATS_LAST) {
		val = mLastLaunches;
		} else {
		val = mLaunches;
		int val = mLaunches;
		if (which == STATS_CURRENT) {
		val -= mLoadedLaunches;
		} else if (which == STATS_SINCE_UNPLUGGED) {
		val -= mUnpluggedLaunches;
		}
		}

		return val;
		}

		@Override
		public long getStartTime(long now, int which) {
		long val;
		if (which == STATS_LAST) {
		val = mLastStartTime;
		} else {
		val = getStartTimeToNowLocked(now);
		long val = getStartTimeToNowLocked(now);
		if (which == STATS_CURRENT) {
		val -= mLoadedStartTime;
		} else if (which == STATS_SINCE_UNPLUGGED) {
		val -= mUnpluggedStartTime;
		}
		}

		return val;
		}

		@Override
		public int getStarts(int which) {
		int val;
		if (which == STATS_LAST) {
		val = mLastStarts;
		} else {
		val = mStarts;
		int val = mStarts;
		if (which == STATS_CURRENT) {
		val -= mLoadedStarts;
		} else if (which == STATS_SINCE_UNPLUGGED) {
		val -= mUnpluggedStarts;
		}
		}

		return val;
		}
		@@ -5591,8 +5516,6 @@ public final class BatteryStatsImpl extends BatteryStats {
		long uptime = SystemClock.uptimeMillis() * 1000;
		long realtime = SystemClock.elapsedRealtime() * 1000;
		initTimes(uptime, realtime);
		mUptimeStart = uptime;
		mRealtimeStart = realtime;
		mDischargeStartLevel = 0;
		mDischargeUnplugLevel = 0;
		mDischargeCurrentLevel = 0;
		@@ -5772,8 +5695,10 @@ public final class BatteryStatsImpl extends BatteryStats {
		mStartClockTime = System.currentTimeMillis();
		mOnBatteryTimeBase.init(uptime, realtime);
		mOnBatteryScreenOffTimeBase.init(uptime, realtime);
		mUptimeStart = uptime;
		mRealtime = 0;
		mUptime = 0;
		mRealtimeStart = realtime;
		mUptimeStart = uptime;
		}

		void initDischarge() {
		@@ -6256,7 +6181,6 @@ public final class BatteryStatsImpl extends BatteryStats {
		public long computeUptime(long curTime, int which) {
		switch (which) {
		case STATS_SINCE_CHARGED: return mUptime + (curTime-mUptimeStart);
		case STATS_LAST: return mLastUptime;
		case STATS_CURRENT: return (curTime-mUptimeStart);
		case STATS_SINCE_UNPLUGGED: return (curTime-mOnBatteryTimeBase.getUptimeStart());
		}
		@@ -6267,7 +6191,6 @@ public final class BatteryStatsImpl extends BatteryStats {
		public long computeRealtime(long curTime, int which) {
		switch (which) {
		case STATS_SINCE_CHARGED: return mRealtime + (curTime-mRealtimeStart);
		case STATS_LAST: return mLastRealtime;
		case STATS_CURRENT: return (curTime-mRealtimeStart);
		case STATS_SINCE_UNPLUGGED: return (curTime-mOnBatteryTimeBase.getRealtimeStart());
		}
		@@ -7303,10 +7226,8 @@ public final class BatteryStatsImpl extends BatteryStats {
		mStartClockTime = in.readLong();
		mUptime = in.readLong();
		mUptimeStart = in.readLong();
		mLastUptime = 0;
		mRealtime = in.readLong();
		mRealtimeStart = in.readLong();
		mLastRealtime = 0;
		mOnBattery = in.readInt() != 0;
		mOnBatteryInternal = false; // we are no longer really running.
		mOnBatteryTimeBase.readFromParcel(in);

services/core/java/com/android/server/AlarmManagerService.java

+8 −11

Original line number	Diff line number	Diff line
		@@ -1348,7 +1348,6 @@ class AlarmManagerService extends SystemService {
		try {
		final boolean unimportant = pi == mTimeTickSender;
		mWakeLock.setUnimportantForLogging(unimportant);
		if (ws != null) {
		if (first \|\| mLastWakeLockUnimportantForLogging) {
		mWakeLock.setHistoryTag(pi.getTag(
		type == ELAPSED_REALTIME_WAKEUP \|\| type == RTC_WAKEUP
		@@ -1357,16 +1356,14 @@ class AlarmManagerService extends SystemService {
		mWakeLock.setHistoryTag(null);
		}
		mLastWakeLockUnimportantForLogging = unimportant;
		if (ws != null) {
		mWakeLock.setWorkSource(ws);
		return;
		} else {
		mLastWakeLockUnimportantForLogging = false;
		}

		final int uid = ActivityManagerNative.getDefault()
		.getUidForIntentSender(pi.getTarget());
		if (uid >= 0) {
		mWakeLock.setHistoryTag(null);
		mWakeLock.setWorkSource(new WorkSource(uid));
		return;
		}