diff options
author | Kenny Guy <kennyguy@google.com> | 2014-07-25 12:25:39 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-25 12:25:39 +0000 |
commit | f6bed3f55b9e77dbb3340af728f748c493eba996 (patch) | |
tree | 6241c9f21a4becdb11620dbaaca8f1a8e5ecbe3d /api | |
parent | 0e2855ae25fbbc70d601a5737415cf069b77e2f1 (diff) | |
parent | abad47b49a43e3c1362187da0e8a4cd4958430d9 (diff) | |
download | frameworks_base-f6bed3f55b9e77dbb3340af728f748c493eba996.zip frameworks_base-f6bed3f55b9e77dbb3340af728f748c493eba996.tar.gz frameworks_base-f6bed3f55b9e77dbb3340af728f748c493eba996.tar.bz2 |
am fae68ecc: am 8717bd4e: Change getBadgedLabelForUser to use CharSequence
* commit 'fae68ecc5d906ca53f181e18f31fc7ce5203ae58':
Change getBadgedLabelForUser to use CharSequence
Diffstat (limited to 'api')
-rw-r--r-- | api/current.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index 943fef5..23c7d03 100644 --- a/api/current.txt +++ b/api/current.txt @@ -22705,7 +22705,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); |