summaryrefslogtreecommitdiff
path: root/core/java/android/app/ActivityThread.java
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-04-28 20:52:29 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-04-28 20:52:29 +0000
commit48f0527199e4775e444e4caeb2063e7e2bc64303 (patch)
treede694ac8502e8916339240a0349a79580ca9561d /core/java/android/app/ActivityThread.java
parent486fdc0b6898e14fb24e4094b800f814e128ebaa (diff)
parentf1ddecc60e0fe4c68961c06ffe0d0c9fdc463791 (diff)
Merge "Close heap dump ParcelFileDescriptor." into rvc-dev
Diffstat (limited to 'core/java/android/app/ActivityThread.java')
-rw-r--r--core/java/android/app/ActivityThread.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index bea85a9974d9..51eaff1ae99f 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -1170,6 +1170,8 @@ public final class ActivityThread extends ClientTransactionHandler {
} catch (IOException e) {
Slog.e(TAG, "Failed to duplicate heap dump file descriptor", e);
return;
+ } finally {
+ IoUtils.closeQuietly(fd);
}
dhd.finishCallback = finishCallback;
sendMessage(H.DUMP_HEAP, dhd, 0, 0, true /*async*/);