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

am d537987b: Changing AUDIO_TURNED_ON constant.

Browse Source 
* commit 'd537987b173f6b48f5196a2ae7d445af1a49e2bb':
  Changing AUDIO_TURNED_ON constant.
This commit is contained in:
Kweku Adams
2014-12-02 19:33:23 +00:00
committed by Android Git Automerger
parent b359f4a871 d537987b17
commit fa99c345c4
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,11 +90,6 @@ public abstract class BatteryStats implements Parcelable {
*/ */
public static final int WIFI_MULTICAST_ENABLED = 7; public static final int WIFI_MULTICAST_ENABLED = 7;
/**
* A constant indicating an audio turn on timer
*/
public static final int AUDIO_TURNED_ON = 7;
/** /**
* A constant indicating a video turn on timer * A constant indicating a video turn on timer
*/ */
@@ -130,6 +125,11 @@ public abstract class BatteryStats implements Parcelable {
*/ */
public static final int JOB = 14; public static final int JOB = 14;
/**
* A constant indicating an audio turn on timer
*/
public static final int AUDIO_TURNED_ON = 15;
/** /**
* Include all of the data in the stats, including previously saved data. * Include all of the data in the stats, including previously saved data.
*/ */

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

@@ -94,7 +94,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 = 114 + (USE_OLD_HISTORY ? 1000 : 0); private static final int VERSION = 115 + (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;