Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 722565a6: Merge "Fix inconsistency in user activity types." into jb-mr1-dev

Browse Source 
* commit '722565a67dcd744e303deebc2e14cdeb447e73d7':
  Fix inconsistency in user activity types.
This commit is contained in:
Jeff Brown
2012-07-27 18:19:17 -07:00
committed by Android Git Automerger
parent a5ad76657d 722565a67d
commit 397aca12c9
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/os/BatteryStats.java
View File

@@ -277,13 +277,15 @@ public abstract class BatteryStats implements Parcelable {
public abstract long getVideoTurnedOnTime(long batteryRealtime, int which); 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 = { 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 void noteUserActivityLocked(int type);
public abstract boolean hasUserActivity(); public abstract boolean hasUserActivity();

11
core/java/com/android/internal/os/BatteryStatsImpl.java
View File

@@ -87,7 +87,7 @@ public final class BatteryStatsImpl extends BatteryStats {
private static final int MAGIC = 0xBA757475; // 'BATSTATS' private static final int MAGIC = 0xBA757475; // 'BATSTATS'
// Current on-disk Parcel version // Current on-disk Parcel version
private static final int VERSION = 61 + (USE_OLD_HISTORY ? 1000 : 0); private static final int VERSION = 62 + (USE_OLD_HISTORY ? 1000 : 0);
// Maximum number of items we will record in the history. // Maximum number of items we will record in the history.
private static final int MAX_HISTORY_ITEMS = 2000; private static final int MAX_HISTORY_ITEMS = 2000;
@@ -2681,9 +2681,12 @@ public final class BatteryStatsImpl extends BatteryStats {
if (mUserActivityCounters == null) { if (mUserActivityCounters == null) {
initUserActivityLocked(); initUserActivityLocked();
} }
if (type < 0) type = 0; if (type >= 0 && type < NUM_USER_ACTIVITY_TYPES) {
else if (type >= NUM_USER_ACTIVITY_TYPES) type = NUM_USER_ACTIVITY_TYPES-1; mUserActivityCounters[type].stepAtomic();
mUserActivityCounters[type].stepAtomic(); } else {
Slog.w(TAG, "Unknown user activity type " + type + " was specified.",
new Throwable());
}
} }
@Override @Override