commit 47f0795d171a25d30ee5b48a6ff1828fb5c92c19
author Xiaohui Chen <xiaohuic@google.com> Fri Oct 02 14:40:27 2015 -0700
committer Xiaohui Chen <xiaohuic@google.com> Fri Oct 02 14:41:58 2015 -0700
tree c902c0cc2cc3a5f7aa2fd8fe52a7de1a57d197e8
parent 621b3fc7a94a9b1bbbb230f264899299a806237b

Cleanup USER_OWNER in pm

Bug: 19913735
Change-Id: I27947f539ca8346e3abd96fc1f800a65945be128

services/core/java/com/android/server/pm/UserManagerService.java

diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java
index 9dc8875..4989a9b 100644
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -840,7 +840,7 @@
         int userVersion = mUserVersion;
         if (userVersion < 1) {
             // Assign a proper name for the owner, if not initialized correctly before
-            UserInfo user = mUsers.get(UserHandle.USER_OWNER);
+            UserInfo user = mUsers.get(UserHandle.USER_SYSTEM);
             if ("Primary".equals(user.name)) {
                 user.name = mContext.getResources().getString(com.android.internal.R.string.owner_name);
                 scheduleWriteUserLocked(user);
@@ -850,7 +850,7 @@
 
         if (userVersion < 2) {
             // Owner should be marked as initialized
-            UserInfo user = mUsers.get(UserHandle.USER_OWNER);
+            UserInfo user = mUsers.get(UserHandle.USER_SYSTEM);
             if ((user.flags & UserInfo.FLAG_INITIALIZED) == 0) {
                 user.flags |= UserInfo.FLAG_INITIALIZED;
                 scheduleWriteUserLocked(user);