Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Fixed readUserListLP() so it recovers when user 0 data is corrupted.""

Browse Source
This commit is contained in:
TreeHugger Robot
2020-06-24 04:08:09 +00:00
committed by Android (Google) Code Review
parent 12f0bb0990 f41d02fa92
commit 32df476f71
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/pm/UserManagerService.java
View File

@@ -2534,12 +2534,7 @@ public class UserManagerService extends IUserManager.Stub {
if (name.equals(TAG_USER)) {
String id = parser.getAttributeValue(null, ATTR_ID);
int userId = Integer.parseInt(id);
UserData userData = readUserLP(userId);
if (userData == null && userId == UserHandle.USER_SYSTEM) {
fallbackToSingleUserLP();
return;
}
UserData userData = readUserLP(Integer.parseInt(id));
if (userData != null) {
synchronized (mUsersLock) {
@@ -3005,8 +3000,10 @@ public class UserManagerService extends IUserManager.Stub {
new AtomicFile(new File(mUsersDir, Integer.toString(id) + XML_SUFFIX));
fis = userFile.openRead();
return readUserLP(id, fis);
} catch (IOException | XmlPullParserException e) {
Slog.e(LOG_TAG, "Error reading user " + id + ": " + e);
} catch (IOException ioe) {
Slog.e(LOG_TAG, "Error reading user list");
} catch (XmlPullParserException pe) {
Slog.e(LOG_TAG, "Error reading user list");
} finally {
IoUtils.closeQuietly(fis);
}