Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am bc853c03: Merge "Close file on exception as well" into ics-mr1

Browse Source 
* commit 'bc853c0344b2bbe6f94f425cd0fb1d2642c0fa2f':
  Close file on exception as well
This commit is contained in:
Kenny Root
2011-11-10 21:20:28 +00:00
committed by Android Git Automerger
parent 0bbd151e1d bc853c0344
commit f4db2fe564
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/java/com/android/server/pm/Settings.java
View File

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