summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-12-15 18:22:54 -0800
committerDianne Hackborn <hackbod@google.com>2011-12-15 18:22:54 -0800
commitbfd89b35bae3f679e1a219f22c07bde9eb63241b (patch)
tree7aa10564088299187ef229d21ed8168092feb41a
parent3766a7a27535101e62af958b1d2d710daa166d7d (diff)
downloadframeworks_base-bfd89b35bae3f679e1a219f22c07bde9eb63241b.zip
frameworks_base-bfd89b35bae3f679e1a219f22c07bde9eb63241b.tar.gz
frameworks_base-bfd89b35bae3f679e1a219f22c07bde9eb63241b.tar.bz2
Don't forget to close files.
Change-Id: Ibfe465e1d7a947bbe40da17e8e8a2713856f95b5
-rw-r--r--services/java/com/android/server/pm/UserManager.java15
1 files changed, 14 insertions, 1 deletions
diff --git a/services/java/com/android/server/pm/UserManager.java b/services/java/com/android/server/pm/UserManager.java
index 76fa5ab..2687728 100644
--- a/services/java/com/android/server/pm/UserManager.java
+++ b/services/java/com/android/server/pm/UserManager.java
@@ -140,6 +140,13 @@ public class UserManager {
fallbackToSingleUser();
} catch (XmlPullParserException pe) {
fallbackToSingleUser();
+ } finally {
+ if (fis != null) {
+ try {
+ fis.close();
+ } catch (IOException e) {
+ }
+ }
}
}
@@ -265,13 +272,19 @@ public class UserManager {
}
}
}
- fis.close();
UserInfo userInfo = new UserInfo(id, name, flags);
return userInfo;
} catch (IOException ioe) {
} catch (XmlPullParserException pe) {
+ } finally {
+ if (fis != null) {
+ try {
+ fis.close();
+ } catch (IOException e) {
+ }
+ }
}
return null;
}