summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jing Ji <jji@google.com> 2022-05-20 23:25:57 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-05-20 23:25:57 +0000
commit9c2b42783fe6a03b9e3d640a6da84b6cfc965cb3 (patch)
tree222eaf2bf7885977cc7576c4bad5451a38be538c
parentfc37e3e6a285b14129717c18464698b95ec7d872 (diff)
parent4740cb695ad17dc06584bc1777170c21b9506f1e (diff)
Merge "Force a battery tracker update on dumping proto request" into tm-dev am: 4740cb695a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18497057 Change-Id: I35e370188cb7aeae147e8597dd01bba9c3d9222d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/core/java/com/android/server/am/AppBatteryTracker.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/am/AppBatteryTracker.java b/services/core/java/com/android/server/am/AppBatteryTracker.java
index 1a566a9e2bc5..661902579317 100644
--- a/services/core/java/com/android/server/am/AppBatteryTracker.java
+++ b/services/core/java/com/android/server/am/AppBatteryTracker.java
@@ -839,6 +839,8 @@ final class AppBatteryTracker extends BaseAppStateTracker<AppBatteryPolicy>
@Override
void dumpAsProto(ProtoOutputStream proto, int uid) {
+ // Force an update.
+ updateBatteryUsageStatsIfNecessary(mInjector.currentTimeMillis(), true);
synchronized (mLock) {
final SparseArray<ImmutableBatteryUsage> uidConsumers = mUidBatteryUsageInWindow;
if (uid != android.os.Process.INVALID_UID) {