commit bfd89b35bae3f679e1a219f22c07bde9eb63241b
author Dianne Hackborn <hackbod@google.com> Thu Dec 15 18:22:54 2011 -0800
committer Dianne Hackborn <hackbod@google.com> Thu Dec 15 18:22:54 2011 -0800
tree 7aa10564088299187ef229d21ed8168092feb41a
parent 3766a7a27535101e62af958b1d2d710daa166d7d

Don't forget to close files.

Change-Id: Ibfe465e1d7a947bbe40da17e8e8a2713856f95b5

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

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 @@
             fallbackToSingleUser();
         } catch (XmlPullParserException pe) {
             fallbackToSingleUser();
+        } finally {
+            if (fis != null) {
+                try {
+                    fis.close();
+                } catch (IOException e) {
+                }
+            }
         }
     }
 
@@ -265,13 +272,19 @@
                     }
                 }
             }
-            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;
     }