From d1db8f8c9dff2245abeb63f3c8067aef88a40b0c Mon Sep 17 00:00:00 2001 From: Rhed Jao Date: Tue, 27 Apr 2021 19:54:23 +0800 Subject: [PATCH] Fix missing the implementation of Computer#dump() in ComputerLocked It's necessary to implement the Computer#dump() in ComputerLocked to ensure a lock is held when the snapshot feature is disabled. Bug: 186505771 Test: adb bugreport Change-Id: I9d3d371320c8e9a550a93177045a5f0ccbb32ffe --- .../java/com/android/server/pm/PackageManagerService.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 3c4a304a5462c..02638349f7294 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -4893,6 +4893,11 @@ public class PackageManagerService extends IPackageManager.Stub return super.filterAppAccess(packageName, callingUid, userId); } } + public void dump(int type, FileDescriptor fd, PrintWriter pw, DumpState dumpState) { + synchronized (mLock) { + super.dump(type, fd, pw, dumpState); + } + } }