Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ead7d90e: Merge "Fix issue #7408647: Add getUserCount() API" into jb-mr1-dev

Browse Source 
* commit 'ead7d90e8b049c9689560015dbb761242fd86c99':
  Fix issue #7408647: Add getUserCount() API
This commit is contained in:
Dianne Hackborn
2012-10-24 18:02:05 -07:00
committed by Android Git Automerger
parent 0c707b2b7e ead7d90e8b
commit 72d0a5aa04
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/17.txt
View File

@@ -16619,6 +16619,7 @@ package android.os {
public class UserManager {
method public long getSerialNumberForUser(android.os.UserHandle);
method public int getUserCount();
method public android.os.UserHandle getUserForSerialNumber(long);
method public java.lang.String getUserName();
method public boolean isUserAGoat();

1
api/current.txt
View File

@@ -16619,6 +16619,7 @@ package android.os {
public class UserManager {
method public long getSerialNumberForUser(android.os.UserHandle);
method public int getUserCount();
method public android.os.UserHandle getUserForSerialNumber(long);
method public java.lang.String getUserName();
method public boolean isUserAGoat();

17
core/java/android/os/UserManager.java
View File

@@ -122,7 +122,7 @@ public class UserManager {
* @param userHandle the user handle of the user whose information is being requested.
* @return the UserInfo object for a specific user.
* @hide
* */
*/
public UserInfo getUserInfo(int userHandle) {
try {
return mService.getUserInfo(userHandle);
@@ -134,10 +134,11 @@ 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.
* number assigned to that user; if the user is deleted and then a new
* user 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.
* @return The serial number of the given user; returns -1 if the
* given UserHandle does not exist.
* @see #getUserForSerialNumber(long)
*/
public long getSerialNumberForUser(UserHandle user) {
@@ -178,6 +179,14 @@ public class UserManager {
}
}
/**
* Return the number of users currently created on the device.
*/
public int getUserCount() {
List<UserInfo> users = getUsers();
return users != null ? users.size() : 1;
}
/**
* Returns information for all users on this device.
* Requires {@link android.Manifest.permission#MANAGE_USERS} permission.