From 2eacc393f89a7d0fd0c515e870ef2ece9d699b45 Mon Sep 17 00:00:00 2001
From: Jing Ji <jji@google.com>
Date: Thu, 19 May 2022 14:18:46 -0700
Subject: [PATCH] Force a battery tracker update on dumping proto request

There is an internal throttling but it shouldn't be applicable to
the dump request.

Bug: 203105544
Test: dumpsys activity app-restrictions --proto
Change-Id: Iff718224f08df1b63f7f90c210faf3e01bbee1e3
---
 services/core/java/com/android/server/am/AppBatteryTracker.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/services/core/java/com/android/server/am/AppBatteryTracker.java b/services/core/java/com/android/server/am/AppBatteryTracker.java
index 1a566a9e2bc5f..6619025793173 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) {