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

Merge "Make sure that the owner user is marked initialized." into jb-mr1.1-dev

Browse Source
This commit is contained in:
Amith Yamasani
2012-11-16 10:43:47 -08:00
committed by Android (Google) Code Review
parent 159cdd925d bc9625059b
commit acddb72c58
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/java/com/android/server/pm/UserManagerService.java
View File

@@ -88,7 +88,7 @@ public class UserManagerService extends IUserManager.Stub {
private static final int MIN_USER_ID = 10; private static final int MIN_USER_ID = 10;
private static final int USER_VERSION = 1; private static final int USER_VERSION = 2;
private static final long EPOCH_PLUS_30_YEARS = 30L * 365 * 24 * 60 * 60 * 1000L; // ms private static final long EPOCH_PLUS_30_YEARS = 30L * 365 * 24 * 60 * 60 * 1000L; // ms
@@ -484,8 +484,7 @@ public class UserManagerService extends IUserManager.Stub {
} }
/** /**
* This fixes an incorrect initialization of user name for the owner. * Upgrade steps between versions, either for fixing bugs or changing the data format.
* TODO: Remove in the next release.
*/ */
private void upgradeIfNecessary() { private void upgradeIfNecessary() {
int userVersion = mUserVersion; int userVersion = mUserVersion;
@@ -499,6 +498,16 @@ public class UserManagerService extends IUserManager.Stub {
userVersion = 1; userVersion = 1;
} }
if (userVersion < 2) {
// Owner should be marked as initialized
UserInfo user = mUsers.get(UserHandle.USER_OWNER);
if ((user.flags & UserInfo.FLAG_INITIALIZED) == 0) {
user.flags |= UserInfo.FLAG_INITIALIZED;
writeUserLocked(user);
}
userVersion = 2;
}
if (userVersion < USER_VERSION) { if (userVersion < USER_VERSION) {
Slog.w(LOG_TAG, "User version " + mUserVersion + " didn't upgrade as expected to " Slog.w(LOG_TAG, "User version " + mUserVersion + " didn't upgrade as expected to "
+ USER_VERSION); + USER_VERSION);