| commit | a54126545f20ed48978a245eb6bebb8e7c8fde48 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Mar 12 21:06:20 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 12 21:06:20 2021 +0000 |
| tree | 4199647bffc007282fcb9ac10f010849230e4ea0 | |
| parent | fd8d5b5c7c1371e7d57213f4e1442436dce3fe86 [diff] | |
| parent | 45a3450d6f8e9cccfdd600a1c14e0f08c4f991f6 [diff] |
Merge "Add getCpuMeasuredBatteryConsumptionUC to FakeUid" into sc-dev am: 45a3450d6f Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13781348 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1c0301bebbefc173ad5248c64298e94596362668
diff --git a/src/com/android/settings/fuelgauge/FakeUid.java b/src/com/android/settings/fuelgauge/FakeUid.java index e1fc7f4..4bb98ed 100644 --- a/src/com/android/settings/fuelgauge/FakeUid.java +++ b/src/com/android/settings/fuelgauge/FakeUid.java
@@ -361,6 +361,11 @@ } @Override + public long getCpuMeasuredBatteryConsumptionUC() { + return 0; + } + + @Override public long[] getCustomConsumerMeasuredBatteryConsumptionUC() { return null; }