diff options
| author | Dan Morrill <morrildl@google.com> | 2012-09-21 09:53:57 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-21 09:53:57 -0700 |
| commit | 466bd636812684aeb8161f144597cc3b3ed39078 (patch) | |
| tree | 061eccd15d638ba6030802f502626c5a72b40435 | |
| parent | 95c942eb227a6740611ac9d00eaafad9da515a11 (diff) | |
| parent | e4ab16ad98b183afbf7a21ad7314372de41a8b57 (diff) | |
| download | frameworks_base-466bd636812684aeb8161f144597cc3b3ed39078.zip frameworks_base-466bd636812684aeb8161f144597cc3b3ed39078.tar.gz frameworks_base-466bd636812684aeb8161f144597cc3b3ed39078.tar.bz2 | |
Merge "New method returning user metadata." into jb-mr1-dev
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/os/UserManager.java | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index a5a8fc8..30028ae 100644 --- a/api/current.txt +++ b/api/current.txt @@ -16593,6 +16593,7 @@ package android.os { public class UserManager { method public java.lang.String getUserName(); + method public boolean isUserAGoat(); } public abstract class Vibrator { diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index 2a5c1aa..96c96d7 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -72,6 +72,15 @@ public class UserManager { } } + /** + * Used to determine whether the user making this call is subject to + * teleportations. + * @return whether the user making this call is a goat + */ + public boolean isUserAGoat() { + return false; + } + /** * Returns the UserInfo object describing a specific user. * Requires {@link android.Manifest.permission#MANAGE_USERS} permission. |