summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Felka Chang <felkachang@google.com> 2023-01-13 06:27:13 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-01-13 06:27:13 +0000
commitfd214867e90709b8f90324cccfe15f861330d426 (patch)
tree757668de258f273d11dbc29e6b3df2ea620c1627
parent7ff054669cc8ddda136d0f094f2eb945c1a4b971 (diff)
parent4f6d3cb5199ab28d6284f62f3365344a5771f43b (diff)
Merge "Fix adb dumpsys resource hang"
-rw-r--r--services/core/java/com/android/server/resources/ResourcesManagerService.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/resources/ResourcesManagerService.java b/services/core/java/com/android/server/resources/ResourcesManagerService.java
index eec3a0259a3e..94aa518b4594 100644
--- a/services/core/java/com/android/server/resources/ResourcesManagerService.java
+++ b/services/core/java/com/android/server/resources/ResourcesManagerService.java
@@ -74,8 +74,8 @@ public class ResourcesManagerService extends SystemService {
@Override
protected void dump(@NonNull FileDescriptor fd,
@NonNull PrintWriter pw, @Nullable String[] args) {
- try {
- mActivityManagerService.dumpAllResources(ParcelFileDescriptor.dup(fd), pw);
+ try (ParcelFileDescriptor pfd = ParcelFileDescriptor.dup(fd)) {
+ mActivityManagerService.dumpAllResources(pfd, pw);
} catch (Exception e) {
pw.println("Exception while trying to dump all resources: " + e.getMessage());
e.printStackTrace(pw);