From 8ae46809779c62089a976738f987df16c9df3517 Mon Sep 17 00:00:00 2001
From: Xiaohui Chen <xiaohuic@google.com>
Date: Thu, 16 Jul 2015 14:31:41 -0700
Subject: [PATCH] sys user split: update createUser method

After the system user is split out, all users are more or less the same.
We combine the generic user and secondary user create method to reflect
this concept.  This also fixes the bug the newly created Primary user
from lock screen contains secondary user restrictions.

Bug: 19913735
Change-Id: I407a877c11346409bad85e00038f6cfd3d126da3
---
 src/com/android/settings/users/UserSettings.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 3c27995806f..3ae3e3277ab 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -394,7 +394,7 @@ public class UserSettings extends SettingsPreferenceFragment
     }
 
     private UserInfo createLimitedUser() {
-        UserInfo newUserInfo = mUserManager.createSecondaryUser(
+        UserInfo newUserInfo = mUserManager.createUser(
                 getResources().getString(R.string.user_new_profile_name),
                 UserInfo.FLAG_RESTRICTED);
         int userId = newUserInfo.id;
@@ -418,7 +418,7 @@ public class UserSettings extends SettingsPreferenceFragment
     }
 
     private UserInfo createTrustedUser() {
-        UserInfo newUserInfo = mUserManager.createSecondaryUser(
+        UserInfo newUserInfo = mUserManager.createUser(
                 getResources().getString(R.string.user_new_user_name), 0);
         if (newUserInfo != null) {
             assignDefaultPhoto(newUserInfo);