diff options
| author | Luca Stefani <luca.stefani.ge1@gmail.com> | 2018-11-13 21:51:14 +0100 |
|---|---|---|
| committer | Luca Stefani <luca.stefani.ge1@gmail.com> | 2018-11-13 21:51:19 +0100 |
| commit | bbf36e55e5b0385969e24c1da38649d4c0125457 (patch) | |
| tree | 062c998364adde961aa97c500a1ebf2e1d7cd9d9 | |
| parent | 09fac9c1f8322944034081ebde39e864413c91ae (diff) | |
| parent | 1797c6976fdc4e475a5fcba18ede7fde395ea21b (diff) | |
| download | core-bbf36e55e5b0385969e24c1da38649d4c0125457.tar.gz core-bbf36e55e5b0385969e24c1da38649d4c0125457.tar.bz2 core-bbf36e55e5b0385969e24c1da38649d4c0125457.zip | |
Merge tag 'android-9.0.0_r16' into lineage-16.0
Android 9.0.0 Release 16 (PQ1A.181105.017.A1)
* tag 'android-9.0.0_r16':
Revert "Support Speck encryption."
metricslogger: fix ACTION_BATTERY_CAUSED_SHUTDOWN not matching proto
Determine product partition path on build time
Add /system/product/* paths to permitted paths
Revert "healthd: add stem to health@2.0-service.override [DO NOT MERGE]"
healthd: add stem to health@2.0-service.override [DO NOT MERGE]
Correct comment in boot image header
Populate recovery DTBO offset correctly
Change-Id: I882432668a4850e957617d2404d5d339073c12fb
| -rw-r--r-- | libmetricslogger/include/metricslogger/metrics_logger.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmetricslogger/include/metricslogger/metrics_logger.h b/libmetricslogger/include/metricslogger/metrics_logger.h index c305db2da..88575be9d 100644 --- a/libmetricslogger/include/metricslogger/metrics_logger.h +++ b/libmetricslogger/include/metricslogger/metrics_logger.h @@ -114,7 +114,7 @@ enum { FIELD_BATTERY_RESISTANCE_UOHMS = 1448, FIELD_BATTERY_CURRENT_UA = 1449, FIELD_HARDWARE_LOCATION = 1450, - ACTION_BATTERY_CAUSED_SHUTDOWN = 1441, + ACTION_BATTERY_CAUSED_SHUTDOWN = 1451, }; enum { |