| commit | e7cdfd9a6df05d336164c42eac194d73f0c887ee | [log] [tgz] |
|---|---|---|
| author | Benjamin Schwartz <bsschwar@google.com> | Wed Feb 17 20:27:04 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 17 20:27:04 2021 +0000 |
| tree | c91f404e58791461eab0305aa9afa33ea8a7f4a4 | |
| parent | cad4604a2e63dae936cd23f7e0a45f2c425c966a [diff] | |
| parent | 9202d2c0a6438ee1260d692d3a8e3398adc621ef [diff] |
Merge "power/stats: Clean up warnings" am: dfd890a101 am: 9202d2c0a6 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1582855 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibf31eb2079cf63608ff344e135430cf132d821a5
diff --git a/power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/EnergyConsumer.aidl b/power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/EnergyConsumer.aidl index c8d7645..cd9239e 100644 --- a/power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/EnergyConsumer.aidl +++ b/power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/EnergyConsumer.aidl
@@ -35,6 +35,6 @@ parcelable EnergyConsumer { int id; int ordinal; - android.hardware.power.stats.EnergyConsumerType type; + android.hardware.power.stats.EnergyConsumerType type = android.hardware.power.stats.EnergyConsumerType.OTHER; @utf8InCpp String name; }
diff --git a/power/stats/aidl/android/hardware/power/stats/EnergyConsumer.aidl b/power/stats/aidl/android/hardware/power/stats/EnergyConsumer.aidl index 2ff1279..ec616f2 100644 --- a/power/stats/aidl/android/hardware/power/stats/EnergyConsumer.aidl +++ b/power/stats/aidl/android/hardware/power/stats/EnergyConsumer.aidl
@@ -32,10 +32,10 @@ int ordinal; /* Type of this EnergyConsumer */ - EnergyConsumerType type; + EnergyConsumerType type = EnergyConsumerType.OTHER; /** * Unique name of this EnergyConsumer. Vendor/device specific. Opaque to framework */ @utf8InCpp String name; -} \ No newline at end of file +}