diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-03-12 20:51:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-03-12 20:51:44 +0000 |
| commit | ff51356f0d518038b214975a0fc6eb51bd87ee28 (patch) | |
| tree | 07737dc166f77eb0f1a404b89787ddb2aa1c8da9 /core/java/android | |
| parent | aef42e776e934f0f9ef2e1a511be910815e455bb (diff) | |
| parent | 02bc36cb4b9db2f8045403c52bcf2740852c1e9d (diff) | |
Merge "Utilize measured cpu batteryconsumption in CpuPowerCalculator" into sc-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/os/BatteryStats.java | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java index 66f7bd9d8dee..4c26e2f33fb2 100644 --- a/core/java/android/os/BatteryStats.java +++ b/core/java/android/os/BatteryStats.java @@ -995,6 +995,15 @@ public abstract class BatteryStats implements Parcelable { public abstract long getScreenOnMeasuredBatteryConsumptionUC(); /** + * Returns the battery consumption (in microcoulombs) of the uid's cpu usage, derived from + * on device power measurement data. + * Will return {@link #POWER_DATA_UNAVAILABLE} if data is unavailable. + * + * {@hide} + */ + public abstract long getCpuMeasuredBatteryConsumptionUC(); + + /** * Returns the battery consumption (in microcoulombs) used by this uid for each * {@link android.hardware.power.stats.EnergyConsumer.ordinal} of (custom) energy consumer * type {@link android.hardware.power.stats.EnergyConsumerType#OTHER}). @@ -2521,6 +2530,15 @@ public abstract class BatteryStats implements Parcelable { public abstract long getScreenDozeMeasuredBatteryConsumptionUC(); /** + * Returns the battery consumption (in microcoulombs) of the cpu, derived from on device power + * measurement data. + * Will return {@link #POWER_DATA_UNAVAILABLE} if data is unavailable. + * + * {@hide} + */ + public abstract long getCpuMeasuredBatteryConsumptionUC(); + + /** * Returns the battery consumption (in microcoulombs) that each * {@link android.hardware.power.stats.EnergyConsumer.ordinal} of (custom) energy consumer * type {@link android.hardware.power.stats.EnergyConsumerType#OTHER}) consumed. |