diff options
| author | Kenny Root <kroot@google.com> | 2011-11-10 09:35:38 -0800 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2011-11-10 09:40:53 -0800 |
| commit | 62539e9efa02c4037d3310a8b4f16f0085cd8c37 (patch) | |
| tree | 8361e63851c841894901d2e038c15a8f3483a4ad /services | |
| parent | 2375d16378e6f8b7694c5a2cd9e0622e382e6049 (diff) | |
| download | frameworks_base-62539e9efa02c4037d3310a8b4f16f0085cd8c37.zip frameworks_base-62539e9efa02c4037d3310a8b4f16f0085cd8c37.tar.gz frameworks_base-62539e9efa02c4037d3310a8b4f16f0085cd8c37.tar.bz2 | |
Close file on exception as well
Bug: 5458045
Change-Id: I4c79b9c273ff69dda292e5cc7b2b60f8db2edbd9
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/pm/Settings.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/services/java/com/android/server/pm/Settings.java b/services/java/com/android/server/pm/Settings.java index bfe6613..36442a0 100644 --- 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(); } |