From 134c59bb40126e8644748d5ad021232c27604d3e Mon Sep 17 00:00:00 2001 From: Kweku Adams Date: Wed, 8 Mar 2017 16:48:01 -0800 Subject: [PATCH] Renaming the second active event to avoid confusion. BUG: 23532995 Test: make -j 32 ... Change-Id: I8d44e98520f40f46727cb57ba77932eee2b1b0ea --- core/java/android/os/BatteryStats.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java index dc170ed259de1..29884b132e5aa 100644 --- a/core/java/android/os/BatteryStats.java +++ b/core/java/android/os/BatteryStats.java @@ -2042,8 +2042,8 @@ public abstract class BatteryStats implements Parcelable { public static final String[] HISTORY_EVENT_NAMES = new String[] { "null", "proc", "fg", "top", "sync", "wake_lock_in", "job", "user", "userfg", "conn", - "active", "pkginst", "pkgunin", "alarm", "stats", "inactive", "active", "tmpwhitelist", - "screenwake", "wakeupap", "longwake", "est_capacity" + "active", "pkginst", "pkgunin", "alarm", "stats", "pkginactive", "pkgactive", + "tmpwhitelist", "screenwake", "wakeupap", "longwake", "est_capacity" }; public static final String[] HISTORY_EVENT_CHECKIN_NAMES = new String[] {