From c74972f89159cb73db7817c3f1d53e1c813fa5bd Mon Sep 17 00:00:00 2001
From: Felipe Leme <felipeal@google.com>
Date: Wed, 8 Jun 2016 09:12:37 -0700
Subject: [PATCH] Wrap closeQuietly() on finally block.

BUG: 29123428
Change-Id: Ife7a919343ce4b73eef759bbc87dd37f12a71bca
---
 core/java/android/app/ActivityThread.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index b220b2e23732a..a48065b120e44 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -1180,8 +1180,11 @@ public final class ActivityThread {
                 AsyncTask.THREAD_POOL_EXECUTOR.execute(new Runnable() {
                     @Override
                     public void run() {
-                        dumpDatabaseInfo(dup.getFileDescriptor(), args);
-                        IoUtils.closeQuietly(dup);
+                        try {
+                            dumpDatabaseInfo(dup.getFileDescriptor(), args);
+                        } finally {
+                            IoUtils.closeQuietly(dup);
+                        }
                     }
                 });
             } else {