Close file on exception as well

Bug: 5458045 Change-Id: I4c79b9c273ff69dda292e5cc7b2b60f8db2edbd9
2011-11-10 09:35:38 -08:00
parent 2375d16378
commit 62539e9efa
1 changed files with 4 additions and 2 deletions
--- a/services/java/com/android/server/pm/Settings.java
+++ b/services/java/com/android/server/pm/Settings.java
@ -63,6 +63,8 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;

+import libcore.io.IoUtils;
+
 /**
 * Holds information about dynamic settings.
 */
@ -998,8 +1000,8 @@ final class Settings {
                FileUtils.sync(fstr);
                str.close();
                journal.commit();
-            }
-            catch (Exception  e) {
+            } catch (Exception e) {
+                IoUtils.closeQuietly(str);
                journal.rollback();
            }