Merge "Finish rename of related users to profiles."
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java
index 031cba7..728c560 100644
--- a/core/java/android/os/UserManager.java
+++ b/core/java/android/os/UserManager.java
@@ -416,15 +416,6 @@
}
/**
- * 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.
* Requires {@link android.Manifest.permission#MANAGE_USERS} permission.
*
@@ -469,15 +460,6 @@
}
/**
- * 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
* userHandle itself.
*