Fix "Resource leak: <Foo> is never closed"

This changeset fixes various code fragments opening
resources without closing them.

Change-Id: I6ed48a32dc5de4c11cab394dd3883ebbb54d2938

2 files changed, 11 insertions, 1 deletions

diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdSelector.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdSelector.java
index 5d24a07..72488a3 100644
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdSelector.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdSelector.java
@@ -1081,6 +1081,7 @@ public final class AvdSelector {
                 Formatter formatter = new Formatter(Locale.US);
                 formatter.format("%.2f", scale);   //$NON-NLS-1$
                 list.add(formatter.toString());
+                formatter.close();
             }
 
             // convert the list into an array for the call to exec.
diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdStartDialog.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdStartDialog.java
index e2ac96b..63787f9 100644
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdStartDialog.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdStartDialog.java
@@ -515,8 +515,9 @@ final class AvdStartDialog extends GridDialog {
      * @return true if both sizes where found.
      */
     private boolean parseLayoutFile(File layoutFile) {
+        BufferedReader input = null;
         try {
-            BufferedReader input = new BufferedReader(new FileReader(layoutFile));
+            input = new BufferedReader(new FileReader(layoutFile));
             String line;
 
             while ((line = input.readLine()) != null) {
@@ -563,6 +564,14 @@ final class AvdStartDialog extends GridDialog {
             // false is returned below.
         } catch (IOException e) {
             // ignore.
+        } finally {
+            if (input != null) {
+                try {
+                    input.close();
+                } catch (IOException e) {
+                    // ignore
+                }
+            }
         }
 
         return false;