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

am: a18a63b23a Change-Id: I3e6769579e08887888b1358be0cb695f32e13749
2016-06-08 18:59:10 +00:00
parent b8ab1d3b12 a18a63b23a
commit ddafe182df
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 {