Merge "Merge "Add API to compute charge time remaining." into pi-dev am: ba6f173cb1 am: ec69f61cc4" (37c3f298) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -32067,6 +32067,7 @@ package android.os {
		}

		public class BatteryManager {
		method public long computeChargeTimeRemaining();
		method public int getIntProperty(int);
		method public long getLongProperty(int);
		method public boolean isCharging();

+16 −0

Original line number	Diff line number	Diff line
		@@ -353,4 +353,20 @@ public class BatteryManager {
		public static boolean isPlugWired(int plugType) {
		return plugType == BATTERY_PLUGGED_USB \|\| plugType == BATTERY_PLUGGED_AC;
		}

		/**
		* Compute an approximation for how much time (in milliseconds) remains until the battery is
		* fully charged. Returns -1 if no time can be computed: either there is not enough current
		* data to make a decision or the battery is currently discharging.
		*
		* @return how much time is left, in milliseconds, until the battery is fully charged or -1 if
		* the computation fails
		*/
		public long computeChargeTimeRemaining() {
		try {
		return mBatteryStats.computeChargeTimeRemaining();
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}
		}