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

am d5423321: am 9934fa77: Merge "Fix issue #3074745: Crash in system process" into gingerbread

Browse Source 
Merge commit 'd5423321b920be10c00fbcbc5a702f15e00693a5'

* commit 'd5423321b920be10c00fbcbc5a702f15e00693a5':
  Fix issue #3074745: Crash in system process
This commit is contained in:
Dianne Hackborn
2010-10-10 17:47:01 -07:00
committed by Android Git Automerger
parent d755d11e93 d5423321b9
commit 50d3fa72d8
2 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -449,6 +449,10 @@ public abstract class BatteryStats implements Parcelable {
public static final int STATE_WAKE_LOCK_FLAG = 1<<17;
public static final int STATE_SENSOR_ON_FLAG = 1<<16;
public static final int MOST_INTERESTING_STATES =
STATE_BATTERY_PLUGGED_FLAG | STATE_SCREEN_ON_FLAG
| STATE_GPS_ON_FLAG | STATE_PHONE_IN_CALL_FLAG;
public int states;
public HistoryItem() {