Merge "Don't forget to close files." (fe781c8c) · Commits · e / os / android_frameworks_base

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

+14 −1

Original line number	Original line	Diff line number	Diff line
	@@ -140,6 +140,13 @@ public class UserManager {
	fallbackToSingleUser();		fallbackToSingleUser();
	} catch (XmlPullParserException pe) {		} catch (XmlPullParserException pe) {
	fallbackToSingleUser();		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);		UserInfo userInfo = new UserInfo(id, name, flags);
	return userInfo;		return userInfo;

	} catch (IOException ioe) {		} catch (IOException ioe) {
	} catch (XmlPullParserException pe) {		} catch (XmlPullParserException pe) {
			} finally {
			if (fis != null) {
			try {
			fis.close();
			} catch (IOException e) {
			}
			}
	}		}
	return null;		return null;
	}		}