Merge "Fix issue #7408647: Add getUserCount() API" into jb-mr1-dev (ead7d90e) · Commits · e / os / android_frameworks_base

api/17.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -16619,6 +16619,7 @@ package android.os {

	public class UserManager {		public class UserManager {
	method public long getSerialNumberForUser(android.os.UserHandle);		method public long getSerialNumberForUser(android.os.UserHandle);
			method public int getUserCount();
	method public android.os.UserHandle getUserForSerialNumber(long);		method public android.os.UserHandle getUserForSerialNumber(long);
	method public java.lang.String getUserName();		method public java.lang.String getUserName();
	method public boolean isUserAGoat();		method public boolean isUserAGoat();

api/current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -16619,6 +16619,7 @@ package android.os {

	public class UserManager {		public class UserManager {
	method public long getSerialNumberForUser(android.os.UserHandle);		method public long getSerialNumberForUser(android.os.UserHandle);
			method public int getUserCount();
	method public android.os.UserHandle getUserForSerialNumber(long);		method public android.os.UserHandle getUserForSerialNumber(long);
	method public java.lang.String getUserName();		method public java.lang.String getUserName();
	method public boolean isUserAGoat();		method public boolean isUserAGoat();

core/java/android/os/UserManager.java

+13 −4

Original line number	Original line	Diff line number	Diff line
	@@ -122,7 +122,7 @@ public class UserManager {
	* @param userHandle the user handle of the user whose information is being requested.		* @param userHandle the user handle of the user whose information is being requested.
	* @return the UserInfo object for a specific user.		* @return the UserInfo object for a specific user.
	* @hide		* @hide
	* */		*/
	public UserInfo getUserInfo(int userHandle) {		public UserInfo getUserInfo(int userHandle) {
	try {		try {
	return mService.getUserInfo(userHandle);		return mService.getUserInfo(userHandle);
	@@ -134,10 +134,11 @@ public class UserManager {

	/**		/**
	* Return the serial number for a user. This is a device-unique		* 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		* number assigned to that user; if the user is deleted and then a new
	* created, the new users will not be given the same serial number.		* user created, the new users will not be given the same serial number.
	* @param user The user whose serial number is to be retrieved.		* @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)		* @see #getUserForSerialNumber(long)
	*/		*/
	public long getSerialNumberForUser(UserHandle user) {		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.		* Returns information for all users on this device.
	* Requires {@link android.Manifest.permission#MANAGE_USERS} permission.		* Requires {@link android.Manifest.permission#MANAGE_USERS} permission.