summaryrefslogtreecommitdiffstats
path: root/core/java/android/os/BatteryStats.java
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2015-08-31 19:04:46 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-08-31 19:04:46 +0000
commitda43a3aacaba069e79f1dbfa491f6bc0b6f7fa95 (patch)
tree147d569df0c54eb9cc32be51f15081f11b98a1be /core/java/android/os/BatteryStats.java
parent144c4ff08a0be40e6b8af1bca269b33557923d71 (diff)
parentab7672d45a66613e23c7769208fc5bc62fe6b363 (diff)
downloadframeworks_base-da43a3aacaba069e79f1dbfa491f6bc0b6f7fa95.zip
frameworks_base-da43a3aacaba069e79f1dbfa491f6bc0b6f7fa95.tar.gz
frameworks_base-da43a3aacaba069e79f1dbfa491f6bc0b6f7fa95.tar.bz2
Merge "BatteryStats: Start using cpu power from kernel" into mnc-dr-dev
Diffstat (limited to 'core/java/android/os/BatteryStats.java')
-rw-r--r--core/java/android/os/BatteryStats.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java
index 4ad9d6d..bad94fc 100644
--- a/core/java/android/os/BatteryStats.java
+++ b/core/java/android/os/BatteryStats.java
@@ -468,6 +468,7 @@ public abstract class BatteryStats implements Parcelable {
* @param which one of STATS_SINCE_CHARGED, STATS_SINCE_UNPLUGGED, or STATS_CURRENT.
* @see BatteryStats#getCpuSpeedSteps()
*/
+ @Deprecated
public abstract long getTimeAtCpuSpeed(int step, int which);
public static abstract class Sensor {