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

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

Merge "BatteryManager: Add battery status to getProperty"

parents 3bcef52d edf0a371

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -29857,6 +29857,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_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 −0
Original line number Diff line number Diff line
@@ -32580,6 +32580,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_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 −0
Original line number Diff line number Diff line
@@ -29949,6 +29949,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_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

+5 −0
Original line number Diff line number Diff line
@@ -201,6 +201,11 @@ public class BatteryManager { 
     */

    public static final int BATTERY_PROPERTY_ENERGY_COUNTER = 5;



    /**

     * Battery charge status, from a BATTERY_STATUS_* value.

     */

    public static final int BATTERY_PROPERTY_BATTERY_STATUS = 6;



    private final IBatteryStats mBatteryStats;

    private final IBatteryPropertiesRegistrar mBatteryPropertiesRegistrar;