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

Commit 9e2ec571 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

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



Change-Id: I152d530526434c932730ec55bef8697fa1dfcea2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 23fe400c 2dbefb7f

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

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

            }



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

        });

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

    }



    @AnyThread