Move UserTypeDetails & UserTypeFactory to services

These two classes should be in service side, i.e.
frameworks/base/service.

Test: atest com.android.server.pm.UserTests
Bug: 142151520
Change-Id: Idcd62ce4469bb194a16fc9ba932178fdd6fe50e5

3 files changed, 5 insertions, 6 deletions

diff --git a/core/java/android/content/pm/UserInfo.java b/core/java/android/content/pm/UserInfo.java
index 42d64d81b17e..cf5d23357d9e 100644
--- a/core/java/android/content/pm/UserInfo.java
+++ b/core/java/android/content/pm/UserInfo.java
@@ -26,8 +26,6 @@ import android.os.UserHandle;
 import android.os.UserManager;
 import android.util.DebugUtils;
 
-import com.android.server.pm.UserTypeDetails;
-
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
@@ -184,7 +182,7 @@ public class UserInfo implements Parcelable {
 
     /**
      * Type of user, such as {@link UserManager#USER_TYPE_PROFILE_MANAGED}, corresponding to
-     * {@link UserTypeDetails#getName()}.
+     * {@link com.android.server.pm.UserTypeDetails#getName()}.
      */
     public String userType;
 
@@ -198,9 +196,10 @@ public class UserInfo implements Parcelable {
     public int restrictedProfileParentId;
 
     /**
-     * Which badge color/label to use within a particular {@link UserTypeDetails}, i.e.
-     * the badgeIndex.
-     * This is an index for distinguishing different profiles with the same parent and user type.
+     * Index for distinguishing different profiles with the same parent and user type for the
+     * purpose of badging.
+     * It is used for determining which badge color/label to use (if applicable) from
+     * the options available for a particular user type.
      */
     public int profileBadge;
 
diff --git a/core/java/com/android/server/pm/UserTypeDetails.java b/services/core/java/com/android/server/pm/UserTypeDetails.java
index 5fc3ba1fc538..5fc3ba1fc538 100644
--- a/core/java/com/android/server/pm/UserTypeDetails.java
+++ b/services/core/java/com/android/server/pm/UserTypeDetails.java
diff --git a/core/java/com/android/server/pm/UserTypeFactory.java b/services/core/java/com/android/server/pm/UserTypeFactory.java
index 43bbab192722..43bbab192722 100644
--- a/core/java/com/android/server/pm/UserTypeFactory.java
+++ b/services/core/java/com/android/server/pm/UserTypeFactory.java