Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de9903cf authored by Alexei Nicoara's avatar Alexei Nicoara Committed by Automerger Merge Worker
Browse files

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

Merge "[Bugfix] avoid deadlock caused by android.bg and RollbackManagerServiceHandler" into main am: 2dbefb7f am: 9e2ec571 am: d43dab52

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2899109



Change-Id: I37c39213c4acdd0d67f88c17e6d1eab31327c421
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d72883a3 d43dab52

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

+1 −1
Original line number Diff line number Diff line
@@ -1279,8 +1279,8 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub implements Rollba 
                ipw.println();

            }



            PackageWatchdog.getInstance(mContext).dump(ipw);

        });

        PackageWatchdog.getInstance(mContext).dump(ipw);

    }



    @AnyThread