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

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

Merge "Revert "batteryservice: add BATTERY_PROP_STATE_OF_HEALTH"" into udc-dev am: 8e8f543a 

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



Change-Id: Ia7509fa7b74e13cd13e27a2c376746e05bee4296
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9f1b32ff 8e8f543a

services/batteryservice/include/batteryservice/BatteryService.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -37,7 +37,6 @@ enum { 
    BATTERY_PROP_CHARGING_POLICY = 7, // equals BATTERY_PROPERTY_CHARGING_POLICY

    BATTERY_PROP_CHARGING_POLICY = 7, // equals BATTERY_PROPERTY_CHARGING_POLICY

    BATTERY_PROP_MANUFACTURING_DATE = 8, // equals BATTERY_PROPERTY_MANUFACTURING_DATE

    BATTERY_PROP_MANUFACTURING_DATE = 8, // equals BATTERY_PROPERTY_MANUFACTURING_DATE

    BATTERY_PROP_FIRST_USAGE_DATE = 9, // equals BATTERY_PROPERTY_FIRST_USAGE_DATE

    BATTERY_PROP_FIRST_USAGE_DATE = 9, // equals BATTERY_PROPERTY_FIRST_USAGE_DATE

    BATTERY_PROP_STATE_OF_HEALTH = 10, // equals BATTERY_PROPERTY_STATE_OF_HEALTH

};

};





struct BatteryProperties {

struct BatteryProperties {