diff options
| author | Jeff Brown <jeffbrown@google.com> | 2012-07-27 18:17:27 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-07-27 18:17:28 -0700 |
| commit | 722565a67dcd744e303deebc2e14cdeb447e73d7 (patch) | |
| tree | e4f9dd7781fab7bffe71293ca1b0ee97e87cfe7d /core/java/android | |
| parent | 6089a88ca54cd18c7f598185389dd2fd1b36114c (diff) | |
| parent | df693de4fe12f081555b449e2726e205fbd86572 (diff) | |
Merge "Fix inconsistency in user activity types." into jb-mr1-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/os/BatteryStats.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java index 2aa6fb5d2250..1bb27bdbcb9f 100644 --- a/core/java/android/os/BatteryStats.java +++ b/core/java/android/os/BatteryStats.java @@ -277,13 +277,15 @@ public abstract class BatteryStats implements Parcelable { public abstract long getVideoTurnedOnTime(long batteryRealtime, int which); /** - * Note that these must match the constants in android.os.LocalPowerManager. + * Note that these must match the constants in android.os.PowerManager. + * Also, if the user activity types change, the BatteryStatsImpl.VERSION must + * also be bumped. */ static final String[] USER_ACTIVITY_TYPES = { - "other", "cheek", "touch", "long_touch", "touch_up", "button", "unknown" + "other", "button", "touch" }; - public static final int NUM_USER_ACTIVITY_TYPES = 7; + public static final int NUM_USER_ACTIVITY_TYPES = 3; public abstract void noteUserActivityLocked(int type); public abstract boolean hasUserActivity(); |