Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ddafe182 authored by Felipe Leme's avatar Felipe Leme Committed by android-build-merger
Browse files

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

am: a18a63b2

Change-Id: I3e6769579e08887888b1358be0cb695f32e13749
parents b8ab1d3b a18a63b2

core/java/android/app/ActivityThread.java

+5 −2
Original line number Original line Diff line number Diff line
@@ -1180,9 +1180,12 @@ public final class ActivityThread { 
                AsyncTask.THREAD_POOL_EXECUTOR.execute(new Runnable() {

                AsyncTask.THREAD_POOL_EXECUTOR.execute(new Runnable() {

                    @Override

                    @Override

                    public void run() {

                    public void run() {

                        try {

                            dumpDatabaseInfo(dup.getFileDescriptor(), args);

                            dumpDatabaseInfo(dup.getFileDescriptor(), args);

                        } finally {

                            IoUtils.closeQuietly(dup);

                            IoUtils.closeQuietly(dup);

                        }

                        }

                    }

                });

                });

            } else {

            } else {

                dumpDatabaseInfo(fd, args);

                dumpDatabaseInfo(fd, args);