From d537987b173f6b48f5196a2ae7d445af1a49e2bb Mon Sep 17 00:00:00 2001 From: Kweku Adams Date: Mon, 24 Nov 2014 17:34:05 -0800 Subject: [PATCH] Changing AUDIO_TURNED_ON constant. Changed so that it's set to a different value from WIFI_MULTICAST_ENABLED. Change-Id: Ied3a2c2bf891f887ec3c7b5249453af4524c099a --- core/java/android/os/BatteryStats.java | 10 +++++----- .../java/com/android/internal/os/BatteryStatsImpl.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java index 4709443d102e8..11fc69e6a2167 100644 --- a/core/java/android/os/BatteryStats.java +++ b/core/java/android/os/BatteryStats.java @@ -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. */ diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java index c00d2097f8262..0dfb11a1d9241 100644 --- a/core/java/com/android/internal/os/BatteryStatsImpl.java +++ b/core/java/com/android/internal/os/BatteryStatsImpl.java @@ -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;