commit 2dbefb7f42e0856f8108a94945dbaed0e0a167cf
author Alexei Nicoara <ancr@google.com> Wed Jan 10 17:02:02 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 10 17:02:02 2024 +0000
tree 0d81d8e8dfb16e52d69cf23eadcc75424bf68e0e
parent 782c1fd11e2e80de97992e65ab9c65ebf0e4a1ba
parent b1776f241ab310866aedb41cd3f86dfdfec057fe

Merge "[Bugfix] avoid deadlock caused by android.bg and RollbackManagerServiceHandler" into main

services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java

diff --git a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
index 720c773..deff3d7 100644
--- a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
+++ b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
@@ -1231,8 +1231,8 @@
                 ipw.println();
             }
 
-            PackageWatchdog.getInstance(mContext).dump(ipw);
         });
+        PackageWatchdog.getInstance(mContext).dump(ipw);
     }
 
     @AnyThread