From b116f89f883a4d17cc7fb2f6723d6a5b9f6c7f27 Mon Sep 17 00:00:00 2001
From: Mayank Garg <gargmayank@google.com>
Date: Wed, 17 Nov 2021 11:20:51 -0800
Subject: [PATCH] Fixed warning related to NewUserRequest

Bug: 199446283
Test: m
Change-Id: Ia0530a28c5e2b7eb38698f104e8c325c11d1245a
---
 core/java/android/os/NewUserRequest.java | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/core/java/android/os/NewUserRequest.java b/core/java/android/os/NewUserRequest.java
index b0e1f91c47c38..45ad74e551aee 100644
--- a/core/java/android/os/NewUserRequest.java
+++ b/core/java/android/os/NewUserRequest.java
@@ -94,8 +94,7 @@ public final class NewUserRequest {
     /**
      * Returns the user type.
      *
-     * <p> Supported types are {@link UserManager.USER_TYPE_FULL_SECONDARY} and
-     * {@link USER_TYPE_FULL_GUEST}
+     * <p> Default value is {@link UserManager#USER_TYPE_FULL_SECONDARY}
      */
     @NonNull
     public String getUserType() {
@@ -203,10 +202,8 @@ public final class NewUserRequest {
 
         /**
          * Sets user type.
-         * <p>
-         * Supported types are {@link UserManager.USER_TYPE_FULL_SECONDARY} and
-         * {@link UserManager.USER_TYPE_FULL_GUEST}. Default value is
-         * {@link UserManager.USER_TYPE_FULL_SECONDARY}.
+         *
+         * <p> Default value is {link UserManager#USER_TYPE_FULL_SECONDARY}.
          *
          * @return This object for method chaining.
          */
@@ -277,16 +274,13 @@ public final class NewUserRequest {
         }
 
         private void checkIfPropertiesAreCompatible() {
-            // Conditions which can't be true simultaneously
-            // A guest user can't be admin user
-            if (mAdmin && mUserType == UserManager.USER_TYPE_FULL_GUEST) {
-                throw new IllegalStateException("A guest user can't be admin.");
+            if (mUserType == null) {
+                throw new IllegalStateException("Usertype cannot be null");
             }
 
-            // check for only supported user types
-            if (mUserType != UserManager.USER_TYPE_FULL_SECONDARY
-                    && mUserType != UserManager.USER_TYPE_FULL_GUEST) {
-                throw new IllegalStateException("Unsupported user type: " + mUserType);
+            // Admin user can only be USER_TYPE_FULL_SECONDARY
+            if (mAdmin && !mUserType.equals(UserManager.USER_TYPE_FULL_SECONDARY)) {
+                throw new IllegalStateException("Admin user can't be of type: " + mUserType);
             }
 
             if (TextUtils.isEmpty(mAccountName) != TextUtils.isEmpty(mAccountType)) {