summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2012-10-04 18:20:41 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-04 18:20:41 -0700
commita9e9eb7026331d4f0ba2fcebeca184df0463b9f2 (patch)
treeca3abc839ac87fdee529b415886a088eb4d932a5 /api
parent32d932c72d268a4f29d0febae951742126ddac72 (diff)
parent0cdbd0776d141011567e63158aa0a430362425ef (diff)
downloadframeworks_base-a9e9eb7026331d4f0ba2fcebeca184df0463b9f2.zip
frameworks_base-a9e9eb7026331d4f0ba2fcebeca184df0463b9f2.tar.gz
frameworks_base-a9e9eb7026331d4f0ba2fcebeca184df0463b9f2.tar.bz2
am 0cdbd077: Merge "Fix issue #7290206: Need API to get/look up user serial number" into jb-mr1-dev
* commit '0cdbd0776d141011567e63158aa0a430362425ef': Fix issue #7290206: Need API to get/look up user serial number
Diffstat (limited to 'api')
-rw-r--r--api/17.txt2
-rw-r--r--api/current.txt2
2 files changed, 4 insertions, 0 deletions
diff --git a/api/17.txt b/api/17.txt
index e86de90..00e84db 100644
--- a/api/17.txt
+++ b/api/17.txt
@@ -16615,6 +16615,8 @@ package android.os {
}
public class UserManager {
+ method public long getSerialNumberForUser(android.os.UserHandle);
+ 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 6288057..ad37426 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -16615,6 +16615,8 @@ package android.os {
}
public class UserManager {
+ method public long getSerialNumberForUser(android.os.UserHandle);
+ method public android.os.UserHandle getUserForSerialNumber(long);
method public java.lang.String getUserName();
method public boolean isUserAGoat();
}