diff options
| author | Jack Wu <wjack@google.com> | 2024-03-04 04:24:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-03-04 04:24:03 +0000 |
| commit | 19f0b98a212892ab05a1a5832e6f2b7f336a0145 (patch) | |
| tree | 7c40388deab475994927b8d345a776c77f7b91da /services | |
| parent | a7b5bdd33bde1509a0bd1a2087a46994d1badd54 (diff) | |
| parent | 5905aa30cf07938dcc298c4fe7b0f2d891ea35c7 (diff) | |
| download | native-19f0b98a212892ab05a1a5832e6f2b7f336a0145.tar.gz | |
Merge "Fix BatteryService enum inconsistent with BatteryManager" into main am: 5905aa30cf
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2982984
Change-Id: I85e98370a76786bc11e58b87b66dfa15bbe5df89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'services')
| -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 }; |