am d537987b: Changing AUDIO_TURNED_ON constant. (fa99c345) · Commits · e / os / android_frameworks_base

core/java/android/os/BatteryStats.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -90,11 +90,6 @@ public abstract class BatteryStats implements Parcelable {
		*/
		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
		*/
		@@ -130,6 +125,11 @@ public abstract class BatteryStats implements Parcelable {
		*/
		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.
		*/

+1 −1

Original line number	Diff line number	Diff line
		@@ -94,7 +94,7 @@ public final class BatteryStatsImpl extends BatteryStats {
		private static final int MAGIC = 0xBA757475; // 'BATSTATS'

		// 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.
		private static final int MAX_HISTORY_ITEMS = 2000;