Merge "Close heap dump ParcelFileDescriptor." into rvc-dev am: 48f0527199 am: fc1392ade0 am: c1b0af4ecd

Change-Id: I8967cbf2515845ba595f94569507edad1459835f
2020-04-28 21:38:49 +00:00
parent 9d5d903f95 c1b0af4ecd
commit c3654b8f20
1 changed files with 2 additions and 0 deletions
--- 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*/);