Telephony: Close the FileReader when finished

Change-Id: I12865e8d974515d4f349d476bcf775e015008e16

1 files changed, 17 insertions, 9 deletions

diff --git a/src/java/com/android/internal/telephony/uicc/SpnOverride.java b/src/java/com/android/internal/telephony/uicc/SpnOverride.java
index 016a793b3..26763eb90 100644
--- a/src/java/com/android/internal/telephony/uicc/SpnOverride.java
+++ b/src/java/com/android/internal/telephony/uicc/SpnOverride.java
@@ -16,6 +16,7 @@
 
 package com.android.internal.telephony.uicc;
 
+import java.io.Closeable;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
@@ -52,20 +53,13 @@ public class SpnOverride {
     }
 
     private void loadSpnOverrides() {
-        FileReader spnReader;
+        FileReader spnReader = null;
 
         final File spnFile = new File(Environment.getRootDirectory(),
                 PARTNER_SPN_OVERRIDE_PATH);
 
         try {
             spnReader = new FileReader(spnFile);
-        } catch (FileNotFoundException e) {
-            Rlog.w(LOG_TAG, "Can not open " +
-                    Environment.getRootDirectory() + "/" + PARTNER_SPN_OVERRIDE_PATH);
-            return;
-        }
-
-        try {
             XmlPullParser parser = Xml.newPullParser();
             parser.setInput(spnReader);
 
@@ -80,14 +74,28 @@ public class SpnOverride {
                 }
 
                 String numeric = parser.getAttributeValue(null, "numeric");
-                String data    = parser.getAttributeValue(null, "spn");
+                String data = parser.getAttributeValue(null, "spn");
 
                 mCarrierSpnMap.put(numeric, data);
             }
+        } catch (FileNotFoundException e) {
+            Rlog.w(LOG_TAG, "Can not open " +
+                    Environment.getRootDirectory() + "/" + PARTNER_SPN_OVERRIDE_PATH);
+            return;
         } catch (XmlPullParserException e) {
             Rlog.w(LOG_TAG, "Exception in spn-conf parser " + e);
         } catch (IOException e) {
             Rlog.w(LOG_TAG, "Exception in spn-conf parser " + e);
+        } finally {
+            closeQuietly(spnReader);
+        }
+    }
+
+    private void closeQuietly(Closeable closeable) {
+        if (closeable != null) {
+            try {
+                closeable.close();
+            } catch (IOException e) {}
         }
     }