commit 72a396489424f1b5607e9c32aed3ed1990ed7ed3
author Darren Hsu <darrenhsu@google.com> Tue Dec 13 00:50:42 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 13 00:50:42 2022 +0000
tree 9466fb59b43a96d8a5140a410f1f524f8108ac92
parent 4c02ef2b4efadccd635e7874fb778c841fd1d1f0
parent c72f7566923a80a5a0b4bc37dab48f943d126e2a

Merge "powerstats: add new EnergyConsumerType for camera"

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

diff --git a/power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/EnergyConsumerType.aidl b/power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/EnergyConsumerType.aidl
index ce3e1f5..28bd59e 100644
--- a/power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/EnergyConsumerType.aidl
+++ b/power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/EnergyConsumerType.aidl
@@ -40,4 +40,5 @@
   GNSS = 4,
   MOBILE_RADIO = 5,
   WIFI = 6,
+  CAMERA = 7,
 }

power/stats/aidl/android/hardware/power/stats/EnergyConsumerType.aidl

diff --git a/power/stats/aidl/android/hardware/power/stats/EnergyConsumerType.aidl b/power/stats/aidl/android/hardware/power/stats/EnergyConsumerType.aidl
index d871ced..ea70785 100644
--- a/power/stats/aidl/android/hardware/power/stats/EnergyConsumerType.aidl
+++ b/power/stats/aidl/android/hardware/power/stats/EnergyConsumerType.aidl
@@ -26,4 +26,5 @@
     GNSS,
     MOBILE_RADIO,
     WIFI,
+    CAMERA,
 }