diff options
| author | Dianne Hackborn <hackbod@google.com> | 2012-10-24 18:04:27 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-24 18:04:27 -0700 |
| commit | a699c1b16f9732308a5c17260607db1b7690d394 (patch) | |
| tree | cc76f48f1031ed1fde5a380c572f797eb804823f /api | |
| parent | 829e001546a96a63b7a742b3dfa1bfa6c592029e (diff) | |
| parent | 72d0a5aa04f18af5037ff331c2f0983f7cbd4331 (diff) | |
| download | frameworks_base-a699c1b16f9732308a5c17260607db1b7690d394.zip frameworks_base-a699c1b16f9732308a5c17260607db1b7690d394.tar.gz frameworks_base-a699c1b16f9732308a5c17260607db1b7690d394.tar.bz2 | |
am 72d0a5aa: am ead7d90e: Merge "Fix issue #7408647: Add getUserCount() API" into jb-mr1-dev
* commit '72d0a5aa04f18af5037ff331c2f0983f7cbd4331':
Fix issue #7408647: Add getUserCount() API
Diffstat (limited to 'api')
| -rw-r--r-- | api/17.txt | 1 | ||||
| -rw-r--r-- | api/current.txt | 1 |
2 files changed, 2 insertions, 0 deletions
@@ -16619,6 +16619,7 @@ package android.os { public class UserManager { method public long getSerialNumberForUser(android.os.UserHandle); + method public int getUserCount(); method public android.os.UserHandle getUserForSerialNumber(long); method public java.lang.String getUserName(); method public boolean isUserAGoat(); diff --git a/api/current.txt b/api/current.txt index e7f02dc..e1e89b5 100644 --- a/api/current.txt +++ b/api/current.txt @@ -16619,6 +16619,7 @@ package android.os { public class UserManager { method public long getSerialNumberForUser(android.os.UserHandle); + method public int getUserCount(); method public android.os.UserHandle getUserForSerialNumber(long); method public java.lang.String getUserName(); method public boolean isUserAGoat(); |