Merge "Finish rename of related users to profiles."

This commit is contained in:
Kenny Guy
2014-04-09 11:42:39 +00:00
committed by Android (Google) Code Review

View File

@@ -415,15 +415,6 @@ public class UserManager {
} }
} }
/**
* Renamed, just present to avoid multi project commit.
* TODO delete.
* @hide
*/
public UserInfo createRelatedUser(String name, int flags, int relatedUserId) {
return createProfileForUser(name, flags, relatedUserId);
}
/** /**
* Creates a user with the specified name and options as a profile of another user. * Creates a user with the specified name and options as a profile of another user.
* Requires {@link android.Manifest.permission#MANAGE_USERS} permission. * Requires {@link android.Manifest.permission#MANAGE_USERS} permission.
@@ -468,15 +459,6 @@ public class UserManager {
} }
} }
/**
* Renaming, left to avoid multi project commit.
* TODO Delete.
* @hide
*/
public List<UserInfo> getRelatedUsers(int userHandle) {
return getProfiles(userHandle);
}
/** /**
* Returns list of the profiles of userHandle including * Returns list of the profiles of userHandle including
* userHandle itself. * userHandle itself.