diff options
| author | Amith Yamasani <yamasani@google.com> | 2013-04-13 17:25:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-13 17:25:16 -0700 |
| commit | 60113556355f25d02d9d0e0556a02483cad8ff48 (patch) | |
| tree | e7fe57100123a3c70a4c8f30e444df6cbf9bf085 | |
| parent | dc97936e366b1e4bcf9fa2dbe7038094a17b8429 (diff) | |
| parent | 6064c5cf22b16464a82f04f0a9560f412ba2a90a (diff) | |
| download | frameworks_base-60113556355f25d02d9d0e0556a02483cad8ff48.zip frameworks_base-60113556355f25d02d9d0e0556a02483cad8ff48.tar.gz frameworks_base-60113556355f25d02d9d0e0556a02483cad8ff48.tar.bz2 | |
am 6064c5cf: am e1375908: Rename isUserLimited to isLinkedUser
* commit '6064c5cf22b16464a82f04f0a9560f412ba2a90a':
Rename isUserLimited to isLinkedUser
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/os/UserManager.java | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt index 2dc36e2..cce01c8 100644 --- a/api/current.txt +++ b/api/current.txt @@ -17084,8 +17084,8 @@ package android.os { method public java.lang.String getUserName(); method public android.os.Bundle getUserRestrictions(); method public android.os.Bundle getUserRestrictions(android.os.UserHandle); + method public boolean isLinkedUser(); method public boolean isUserAGoat(); - method public boolean isUserLimited(); method public boolean isUserRunning(android.os.UserHandle); method public boolean isUserRunningOrStopping(android.os.UserHandle); method public void setUserRestriction(java.lang.String, boolean); diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index c61bf84..e580e2b 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -198,11 +198,11 @@ public class UserManager { } /** - * Used to check if the user making this call is a limited user. Limited users may have + * Used to check if the user making this call is linked to another user. Linked users may have * a reduced number of available apps, app restrictions and account restrictions. - * @return whether the user making this call is a limited user + * @return whether the user making this call is a linked user */ - public boolean isUserLimited() { + public boolean isLinkedUser() { try { return mService.isRestricted(); } catch (RemoteException re) { |