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

Commit 2e88d4b6 authored by Jin Qian's avatar Jin Qian
Browse files

BatteryManager: rename BATTERY_PROPERTY_BATTERY_STATUS 

To BATTERY_PROPERTY_STATUS

Test: build
Bug: 35813122
Change-Id: Ia8308def79b79706dbdc3e47f93afa56661a47aa
parent 3b264fa2

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -29891,7 +29891,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
@@ -32689,7 +32689,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
@@ -29987,7 +29987,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
@@ -204,7 +204,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;