Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30b367a0 authored by Felipe Leme's avatar Felipe Leme
Browse files

Updated javadoc and removed @Nullable from some internal UMS methods. 

Bug: 432508642
Test: echo "In PreSubmit we trust!"
Flag: EXEMPT documentation change only

Change-Id: I62a63051bc8fb6bd03a4d20acba0afff38433090
parent a3677d73

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

+5 −7
Original line number Diff line number Diff line
@@ -2492,11 +2492,9 @@ public class UserManagerService extends IUserManager.Stub { 
    }



    /**

     * Returns a UserInfo object with the name filled in, for Owner and Guest, or the original

     * if the name is already set.

     *

     * <p><b>Note:</b> Currently, the resulting name can be {@code null} if a user was truly created

     * with a {@code null} name.

     * Returns a {@link UserInfo} object with the name filled in. The name will be the original name

     * if it is already set, or else a proper localized name (like "Owner" or "Guest") if the

     * original name is {@code null}.

     */

    @VisibleForTesting

    @Nullable UserInfo userWithName(@Nullable UserInfo orig) {
@@ -2511,11 +2509,11 @@ public class UserManagerService extends IUserManager.Stub { 
        return orig;

    }



    @Nullable String getName(UserInfo user) {

    @NonNull String getName(UserInfo user) {

        return getName(user, /* logUser0Allocations= */ false);

    }



    private @Nullable String getName(UserInfo user, boolean logUser0Allocations) {

    private @NonNull String getName(UserInfo user, boolean logUser0Allocations) {

        if (user.name != null) {

            return user.name;

        }