Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4db2fe5 authored by Kenny Root's avatar Kenny Root Committed by Android Git Automerger
Browse files

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

* commit 'bc853c03':
  Close file on exception as well
parents 0bbd151e bc853c03

services/java/com/android/server/pm/Settings.java

+4 −2
Original line number Diff line number Diff line
@@ -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();

            }