commit c781b6e6da614dcc3573457af0840aa7a404930a
author Rupesh Bansal <brup@google.com> Mon Sep 02 13:42:47 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 02 13:42:47 2024 +0000
tree 376c924f2e4c58adf69658b1aeb86251f180f90d
parent 74db5616308576c09becc39a28b8ac2199845290
parent b91d93334518f1b88c9f524e3ba9942c2423c5f3

Merge "Fix the timestamp from notifier to WakelockLogs" into main

services/core/java/com/android/server/power/Notifier.java

diff --git a/services/core/java/com/android/server/power/Notifier.java b/services/core/java/com/android/server/power/Notifier.java
index 1a2a196..303828f 100644
--- a/services/core/java/com/android/server/power/Notifier.java
+++ b/services/core/java/com/android/server/power/Notifier.java
@@ -1064,9 +1064,9 @@
     private void notifyWakeLockListener(IWakeLockCallback callback, String tag, boolean isEnabled,
             int ownerUid, int ownerPid, int flags, WorkSource workSource, String packageName,
             String historyTag) {
+        long currentTime = mInjector.currentTimeMillis();
         mHandler.post(() -> {
             if (mFlags.improveWakelockLatency()) {
-                long currentTime = mInjector.currentTimeMillis();
                 if (isEnabled) {
                     notifyWakelockAcquisition(tag, ownerUid, ownerPid, flags,
                             workSource, packageName, historyTag, currentTime);