Merge \"Wrap closeQuietly() on finally block.\" into nyc-dev

am: fb5995cfbb Change-Id: I34fbe82455b113d2608f64f9220f5a1757e39627
2016-06-08 18:16:43 +00:00
parent c33507d441 fb5995cfbb
commit a18a63b23a
1 changed files with 5 additions and 2 deletions
--- 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 {