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

Commit 82e9bd11 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am a9e9eb70: am 0cdbd077: Merge "Fix issue #7290206: Need API to get/look up...

am a9e9eb70: am 0cdbd077: Merge "Fix issue #7290206: Need API to get/look up user serial number" into jb-mr1-dev

* commit 'a9e9eb70':
  Fix issue #7290206: Need API to get/look up user serial number
parents 47266092 a9e9eb70
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -16615,6 +16615,8 @@ package android.os {
  }
  public class UserManager {
    method public long getSerialNumberForUser(android.os.UserHandle);
    method public android.os.UserHandle getUserForSerialNumber(long);
    method public java.lang.String getUserName();
    method public boolean isUserAGoat();
  }
+2 −0
Original line number Diff line number Diff line
@@ -16615,6 +16615,8 @@ package android.os {
  }
  public class UserManager {
    method public long getSerialNumberForUser(android.os.UserHandle);
    method public android.os.UserHandle getUserForSerialNumber(long);
    method public java.lang.String getUserName();
    method public boolean isUserAGoat();
  }
+26 −0
Original line number Diff line number Diff line
@@ -97,6 +97,32 @@ public class UserManager {
        }
    }

    /**
     * Return the serial number for a user.  This is a device-unique
     * number assigned to that user; if the user is deleted and new users
     * created, the new users will not be given the same serial number.
     * @param user The user whose serial number is to be retrieved.
     * @return The serial number of the given user.
     * @see #getUserForSerialNumber(long)
     */
    public long getSerialNumberForUser(UserHandle user) {
        return getUserSerialNumber(user.getIdentifier());
    }

    /**
     * Return the user associated with a serial number previously
     * returned by {@link #getSerialNumberForUser(UserHandle)}.
     * @param serialNumber The serial number of the user that is being
     * retrieved.
     * @return Return the user associated with the serial number, or null
     * if there is not one.
     * @see #getSerialNumberForUser(UserHandle)
     */
    public UserHandle getUserForSerialNumber(long serialNumber) {
        int ident = getUserHandle((int)serialNumber);
        return ident >= 0 ? new UserHandle(ident) : null;
    }

    /**
     * Creates a user with the specified name and options.
     * Requires {@link android.Manifest.permission#MANAGE_USERS} permission.