Merge "Add IBatteryStats API to retrieve current charge times." (3e77bb83) · Commits · e / os / android_frameworks_base

core/java/android/os/BatteryStats.java

+76 −2

Original line number	Diff line number	Diff line
		@@ -173,6 +173,8 @@ public abstract class BatteryStats implements Parcelable {
		private static final String BLUETOOTH_STATE_COUNT_DATA = "bsc";
		private static final String POWER_USE_SUMMARY_DATA = "pws";
		private static final String POWER_USE_ITEM_DATA = "pwi";
		private static final String DISCHARGE_STEP_DATA = "dsd";
		private static final String CHARGE_STEP_DATA = "csd";

		private final StringBuilder mFormatBuilder = new StringBuilder(32);
		private final Formatter mFormatter = new Formatter(mFormatBuilder);
		@@ -1339,6 +1341,18 @@ public abstract class BatteryStats implements Parcelable {
		*/
		public abstract long computeBatteryTimeRemaining(long curTime);

		/**
		* Return the historical number of discharge steps we currently have.
		*/
		public abstract int getNumDischargeStepDurations();

		/**
		* Return the array of discharge step durations; the number of valid
		* items in it is returned by {@link #getNumDischargeStepDurations()}.
		* These values are in milliseconds.
		*/
		public abstract long[] getDischargeStepDurationsArray();

		/**
		* Compute an approximation for how much time (in microseconds) remains until the battery
		* is fully charged. Returns -1 if no time can be computed: either there is not
		@@ -1349,6 +1363,18 @@ public abstract class BatteryStats implements Parcelable {
		*/
		public abstract long computeChargeTimeRemaining(long curTime);

		/**
		* Return the historical number of charge steps we currently have.
		*/
		public abstract int getNumChargeStepDurations();

		/**
		* Return the array of charge step durations; the number of valid
		* items in it is returned by {@link #getNumChargeStepDurations()}.
		* These values are in milliseconds.
		*/
		public abstract long[] getChargeStepDurationsArray();

		public abstract Map<String, ? extends LongCounter> getWakeupReasonStats();

		public abstract Map<String, ? extends Timer> getKernelWakelockStats();
		@@ -3120,6 +3146,28 @@ public abstract class BatteryStats implements Parcelable {
		pw.print(suffix);
		}

		private static boolean dumpDurationSteps(PrintWriter pw, String header, long[] steps,
		int count, boolean checkin) {
		if (count <= 0) {
		return false;
		}
		if (!checkin) {
		pw.println(header);
		}
		String[] lineArgs = new String[1];
		for (int i=0; i<count; i++) {
		if (checkin) {
		lineArgs[0] = Long.toString(steps[i]);
		dumpLine(pw, 0 /* uid /, "i" / category */, header, (Object[])lineArgs);
		} else {
		pw.print(" #"); pw.print(i); pw.print(": ");
		TimeUtils.formatDuration(steps[i], pw);
		pw.println();
		}
		}
		return true;
		}

		public static final int DUMP_UNPLUGGED_ONLY = 1<<0;
		public static final int DUMP_CHARGED_ONLY = 1<<1;
		public static final int DUMP_HISTORY_ONLY = 1<<2;
		@@ -3239,7 +3287,27 @@ public abstract class BatteryStats implements Parcelable {
		}
		}
		if (didPid) {
		pw.println("");
		pw.println();
		}
		if (dumpDurationSteps(pw, "Discharge step durations:", getDischargeStepDurationsArray(),
		getNumDischargeStepDurations(), false)) {
		long timeRemaining = computeBatteryTimeRemaining(SystemClock.elapsedRealtime());
		if (timeRemaining >= 0) {
		pw.print(" Estimated discharge time remaining: ");
		TimeUtils.formatDuration(timeRemaining / 1000, pw);
		pw.println();
		}
		pw.println();
		}
		if (dumpDurationSteps(pw, "Charge step durations:", getChargeStepDurationsArray(),
		getNumChargeStepDurations(), false)) {
		long timeRemaining = computeChargeTimeRemaining(SystemClock.elapsedRealtime());
		if (timeRemaining >= 0) {
		pw.print(" Estimated charge time remaining: ");
		TimeUtils.formatDuration(timeRemaining / 1000, pw);
		pw.println();
		}
		pw.println();
		}
		}

		@@ -3248,7 +3316,7 @@ public abstract class BatteryStats implements Parcelable {
		pw.println(" System starts: " + getStartCount()
		+ ", currently on battery: " + getIsOnBattery());
		dumpLocked(context, pw, "", STATS_SINCE_CHARGED, reqUid);
		pw.println("");
		pw.println();
		}
		if (!filtering \|\| (flags&DUMP_UNPLUGGED_ONLY) != 0) {
		pw.println("Statistics since last unplugged:");
		@@ -3352,6 +3420,12 @@ public abstract class BatteryStats implements Parcelable {
		}
		}
		}
		if (!filtering) {
		dumpDurationSteps(pw, DISCHARGE_STEP_DATA, getDischargeStepDurationsArray(),
		getNumDischargeStepDurations(), true);
		dumpDurationSteps(pw, CHARGE_STEP_DATA, getChargeStepDurationsArray(),
		getNumChargeStepDurations(), true);
		}
		if (!filtering \|\| (flags&DUMP_CHARGED_ONLY) != 0) {
		dumpCheckinLocked(context, pw, STATS_SINCE_CHARGED, -1);
		}

core/java/com/android/internal/app/IBatteryStats.aidl

+8 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,14 @@ interface IBatteryStats {
		// Remaining methods are only used in Java.
		byte[] getStatistics();

		// Return the computed amount of time remaining on battery, in milliseconds.
		// Returns -1 if nothing could be computed.
		long computeBatteryTimeRemaining();

		// Return the computed amount of time remaining to fully charge, in milliseconds.
		// Returns -1 if nothing could be computed.
		long computeChargeTimeRemaining();

		void addIsolatedUid(int isolatedUid, int appUid);
		void removeIsolatedUid(int isolatedUid, int appUid);

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

+16 −19

Original line number	Diff line number	Diff line
		@@ -6358,6 +6358,14 @@ public final class BatteryStatsImpl extends BatteryStats {
		return (msPerLevel * mCurrentBatteryLevel) * 1000;
		}

		public int getNumDischargeStepDurations() {
		return mNumDischargeStepDurations;
		}

		public long[] getDischargeStepDurationsArray() {
		return mDischargeStepDurations;
		}

		@Override
		public long computeChargeTimeRemaining(long curTime) {
		if (mOnBattery) {
		@@ -6387,6 +6395,14 @@ public final class BatteryStatsImpl extends BatteryStats {
		return (msPerLevel * (100-mCurrentBatteryLevel)) * 1000;
		}

		public int getNumChargeStepDurations() {
		return mNumChargeStepDurations;
		}

		public long[] getChargeStepDurationsArray() {
		return mChargeStepDurations;
		}

		long getBatteryUptimeLocked() {
		return mOnBatteryTimeBase.getUptime(SystemClock.uptimeMillis() * 1000);
		}
		@@ -7705,25 +7721,6 @@ public final class BatteryStatsImpl extends BatteryStats {
		pr.println("*** Bluetooth active type #" + i + ":");
		mBluetoothStateTimer[i].logState(pr, " ");
		}
		StringBuilder sb = new StringBuilder(128);
		if (mNumDischargeStepDurations > 0) {
		pr.println("*** Discharge step durations:");
		for (int i=0; i<mNumDischargeStepDurations; i++) {
		sb.setLength(0);
		sb.append(" #"); sb.append(i); sb.append(": ");
		formatTimeMs(sb, mDischargeStepDurations[i]);
		pr.println(sb.toString());
		}
		}
		if (mNumChargeStepDurations > 0) {
		pr.println("*** Charge step durations:");
		for (int i=0; i<mNumChargeStepDurations; i++) {
		sb.setLength(0);
		sb.append(" #"); sb.append(i); sb.append(": ");
		formatTimeMs(sb, mChargeStepDurations[i]);
		pr.println(sb.toString());
		}
		}
		}
		super.dumpLocked(context, pw, flags, reqUid, histStart);
		}

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

+14 −0

Original line number	Diff line number	Diff line
		@@ -110,6 +110,20 @@ public final class BatteryStatsService extends IBatteryStats.Stub {
		return data;
		}

		public long computeBatteryTimeRemaining() {
		synchronized (mStats) {
		long time = mStats.computeBatteryTimeRemaining(SystemClock.elapsedRealtime());
		return time >= 0 ? (time/1000) : time;
		}
		}

		public long computeChargeTimeRemaining() {
		synchronized (mStats) {
		long time = mStats.computeChargeTimeRemaining(SystemClock.elapsedRealtime());
		return time >= 0 ? (time/1000) : time;
		}
		}

		public void addIsolatedUid(int isolatedUid, int appUid) {
		enforceCallingPermission();
		synchronized (mStats) {