diff options
| author | 2024-03-04 05:05:08 +0000 | |
|---|---|---|
| committer | 2024-03-04 05:05:08 +0000 | |
| commit | 2d5ba921956704d108f8893b87f80f4633a1165c (patch) | |
| tree | f9245461f12afd6fa3b08f36311cd384a40220d0 | |
| parent | d129f1825d3027ca41bfb278757a6a3263c872f3 (diff) | |
| parent | 19f0b98a212892ab05a1a5832e6f2b7f336a0145 (diff) | |
Merge "Fix BatteryService enum inconsistent with BatteryManager" into main am: 5905aa30cf am: 19f0b98a21
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2982984
Change-Id: I541962bc2783734d9848263683c0bb5ac809c62f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/batteryservice/include/batteryservice/BatteryService.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/services/batteryservice/include/batteryservice/BatteryService.h b/services/batteryservice/include/batteryservice/BatteryService.h index 654c903db2..f697f94a7e 100644 --- a/services/batteryservice/include/batteryservice/BatteryService.h +++ b/services/batteryservice/include/batteryservice/BatteryService.h @@ -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 }; |