Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e62fdbc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Renaming the second active event to avoid confusion."

parents 5bf03b76 134c59bb

core/java/android/os/BatteryStats.java

+2 −2
Original line number Diff line number Diff line
@@ -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[] {