Telephony: Close the FileReader when finished (44f20f98) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/uicc/SpnOverride.java

+17 −9

Original line number	Diff line number	Diff line
		@@ -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);

		@@ -84,10 +78,24 @@ public class SpnOverride {

		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) {}
		}
		}