summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorKenny Guy <kennyguy@google.com>2014-07-25 12:38:23 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-25 12:38:23 +0000
commit7800c40177fdda5e947195a4f7b5cba6ad1e2bd8 (patch)
tree69a83b0addbbdb27ddad3490ff4eeb30a9d32199 /api
parent20c8e702d41306bddec30c10e2b8637322081e64 (diff)
parentf6bed3f55b9e77dbb3340af728f748c493eba996 (diff)
downloadframeworks_base-7800c40177fdda5e947195a4f7b5cba6ad1e2bd8.zip
frameworks_base-7800c40177fdda5e947195a4f7b5cba6ad1e2bd8.tar.gz
frameworks_base-7800c40177fdda5e947195a4f7b5cba6ad1e2bd8.tar.bz2
am b4836b12: am fae68ecc: am 8717bd4e: Change getBadgedLabelForUser to use CharSequence
* commit 'b4836b1259c924dfdebd82cc4c2275b5d3a88bf0': Change getBadgedLabelForUser to use CharSequence
Diffstat (limited to 'api')
-rw-r--r--api/current.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt
index 56fd699..d970614 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -22707,7 +22707,7 @@ package android.os {
public class UserManager {
method public android.os.Bundle getApplicationRestrictions(java.lang.String);
method public android.graphics.drawable.Drawable getBadgedDrawableForUser(android.graphics.drawable.Drawable, android.os.UserHandle);
- method public java.lang.String getBadgedLabelForUser(java.lang.String, android.os.UserHandle);
+ method public java.lang.CharSequence getBadgedLabelForUser(java.lang.CharSequence, android.os.UserHandle);
method public long getSerialNumberForUser(android.os.UserHandle);
method public int getUserCount();
method public android.os.UserHandle getUserForSerialNumber(long);