diff options
| author | 2013-04-25 21:22:31 -0700 | |
|---|---|---|
| committer | 2013-04-25 21:22:31 -0700 | |
| commit | 83a6142173fbd3ddf5c4285e2b6359e44beaddb0 (patch) | |
| tree | abd64e96aebb1c3902fb0b220ea2b791d404a34a | |
| parent | 7a21c4cdb172f6353cd4166e80910893dc981196 (diff) | |
| parent | bbd90f8e7051fde96092cacdebc5d94ce46c7140 (diff) | |
am bbd90f8e: Merge "Hide isLinkedUser()" into jb-mr2-dev
* commit 'bbd90f8e7051fde96092cacdebc5d94ce46c7140':
Hide isLinkedUser()
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/os/UserManager.java | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index dcdf0ba565d0..34187618c5de 100644 --- a/api/current.txt +++ b/api/current.txt @@ -17643,7 +17643,6 @@ 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 isUserRunning(android.os.UserHandle); method public boolean isUserRunningOrStopping(android.os.UserHandle); diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index df065e93e16a..cb5ed4f2c15d 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -202,6 +202,7 @@ public class UserManager { * 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 linked user + * @hide */ public boolean isLinkedUser() { try { |