commit bf4602f8f0ffed816727940e228e6f5ebccd618c
author Benjamin Schwartz <bsschwar@google.com> Wed Feb 17 21:26:51 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 17 21:26:51 2021 +0000
tree d7e290a957ad1f2d8081972a9f5857e3dc28cc80
parent 6456d07b375f4d9ddcbc267dec34ba495801983b
parent 0e74eb234ed65718c9c1b47874d5cd7631b6b089

Merge "power/stats: Clean up warnings" am: dfd890a101 am: 9202d2c0a6 am: e7cdfd9a6d am: 0e74eb234e

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1582855

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I98ab93a72798b07f537bbe680bb98ea82bcf493b

power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/EnergyConsumer.aidl

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;
 }

power/stats/aidl/android/hardware/power/stats/EnergyConsumer.aidl

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
+}