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

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

Merge "BatteryManager: rename BATTERY_PROPERTY_BATTERY_STATUS"

parents a7aaae88 2e88d4b6

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -30037,7 +30037,7 @@ package android.os { 
    field public static final int BATTERY_PLUGGED_AC = 1; // 0x1

    field public static final int BATTERY_PLUGGED_USB = 2; // 0x2

    field public static final int BATTERY_PLUGGED_WIRELESS = 4; // 0x4

    field public static final int BATTERY_PROPERTY_BATTERY_STATUS = 6; // 0x6

    field public static final int BATTERY_PROPERTY_STATUS = 6; // 0x6

    field public static final int BATTERY_PROPERTY_CAPACITY = 4; // 0x4

    field public static final int BATTERY_PROPERTY_CHARGE_COUNTER = 1; // 0x1

    field public static final int BATTERY_PROPERTY_CURRENT_AVERAGE = 3; // 0x3

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -32634,7 +32634,7 @@ package android.os { 
    field public static final int BATTERY_PLUGGED_AC = 1; // 0x1

    field public static final int BATTERY_PLUGGED_USB = 2; // 0x2

    field public static final int BATTERY_PLUGGED_WIRELESS = 4; // 0x4

    field public static final int BATTERY_PROPERTY_BATTERY_STATUS = 6; // 0x6

    field public static final int BATTERY_PROPERTY_STATUS = 6; // 0x6

    field public static final int BATTERY_PROPERTY_CAPACITY = 4; // 0x4

    field public static final int BATTERY_PROPERTY_CHARGE_COUNTER = 1; // 0x1

    field public static final int BATTERY_PROPERTY_CURRENT_AVERAGE = 3; // 0x3

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -30133,7 +30133,7 @@ package android.os { 
    field public static final int BATTERY_PLUGGED_AC = 1; // 0x1

    field public static final int BATTERY_PLUGGED_USB = 2; // 0x2

    field public static final int BATTERY_PLUGGED_WIRELESS = 4; // 0x4

    field public static final int BATTERY_PROPERTY_BATTERY_STATUS = 6; // 0x6

    field public static final int BATTERY_PROPERTY_STATUS = 6; // 0x6

    field public static final int BATTERY_PROPERTY_CAPACITY = 4; // 0x4

    field public static final int BATTERY_PROPERTY_CHARGE_COUNTER = 1; // 0x1

    field public static final int BATTERY_PROPERTY_CURRENT_AVERAGE = 3; // 0x3

core/java/android/os/BatteryManager.java

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ public class BatteryManager { 
    /**

     * Battery charge status, from a BATTERY_STATUS_* value.

     */

    public static final int BATTERY_PROPERTY_BATTERY_STATUS = 6;

    public static final int BATTERY_PROPERTY_STATUS = 6;



    private final IBatteryStats mBatteryStats;

    private final IBatteryPropertiesRegistrar mBatteryPropertiesRegistrar;