diff options
| author | 2024-01-10 19:31:29 +0000 | |
|---|---|---|
| committer | 2024-01-10 19:31:29 +0000 | |
| commit | d43dab5284eb2a4d7abaf6fdd171f54a1f04ce3a (patch) | |
| tree | d67a380c960987b174698e5ec3e37082d55cf6d8 | |
| parent | d1a3d082b25eef60fe4e1fc49245c0de566342e7 (diff) | |
| parent | 9e2ec571f5e4227d78639270d6e84eb42e0b9d80 (diff) | |
Merge "[Bugfix] avoid deadlock caused by android.bg and RollbackManagerServiceHandler" into main am: 2dbefb7f42 am: 9e2ec571f5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2899109
Change-Id: I5678c24df21fbc6b108039f55fce00b4c0c9c463
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java index 720c773a032a..deff3d793854 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 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub implements Rollba ipw.println(); } - PackageWatchdog.getInstance(mContext).dump(ipw); }); + PackageWatchdog.getInstance(mContext).dump(ipw); } @AnyThread |