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

Commit 19f0b98a authored by Jack Wu's avatar Jack Wu Committed by Automerger Merge Worker
Browse files

Merge "Fix BatteryService enum inconsistent with BatteryManager" into main am: 5905aa30 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2982984



Change-Id: I85e98370a76786bc11e58b87b66dfa15bbe5df89
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a7b5bdd3 5905aa30

services/batteryservice/include/batteryservice/BatteryService.h

+3 −3
Original line number Diff line number Diff line
@@ -34,9 +34,9 @@ enum { 
    BATTERY_PROP_CAPACITY = 4, // equals BATTERY_PROPERTY_CAPACITY

    BATTERY_PROP_ENERGY_COUNTER = 5, // equals BATTERY_PROPERTY_ENERGY_COUNTER

    BATTERY_PROP_BATTERY_STATUS = 6, // equals BATTERY_PROPERTY_BATTERY_STATUS

    BATTERY_PROP_CHARGING_POLICY = 7, // equals BATTERY_PROPERTY_CHARGING_POLICY

    BATTERY_PROP_MANUFACTURING_DATE = 8, // equals BATTERY_PROPERTY_MANUFACTURING_DATE

    BATTERY_PROP_FIRST_USAGE_DATE = 9, // equals BATTERY_PROPERTY_FIRST_USAGE_DATE

    BATTERY_PROP_MANUFACTURING_DATE = 7, // equals BATTERY_PROPERTY_MANUFACTURING_DATE

    BATTERY_PROP_FIRST_USAGE_DATE = 8, // equals BATTERY_PROPERTY_FIRST_USAGE_DATE

    BATTERY_PROP_CHARGING_POLICY = 9, // equals BATTERY_PROPERTY_CHARGING_POLICY

    BATTERY_PROP_STATE_OF_HEALTH = 10, // equals BATTERY_PROPERTY_STATE_OF_HEALTH

    BATTERY_PROP_PART_STATUS = 12, // equals BATTERY_PROPERTY_PART_STATUS

};