Change getBadgedLabelForUser to use CharSequence

Bug: 16401636
Change-Id: I45410a6293007dd789d6770d63397824559b756e

1 files changed, 10 insertions, 1 deletions

diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java
index 45edf28..a506c42 100644
--- a/core/java/android/os/UserManager.java
+++ b/core/java/android/os/UserManager.java
@@ -772,7 +772,7 @@ public class UserManager {
      * @return A label that combines the original label and a badge as
      *         determined by the system.
      */
-    public String getBadgedLabelForUser(String label, UserHandle user) {
+    public CharSequence getBadgedLabelForUser(CharSequence label, UserHandle user) {
         UserInfo userInfo = getUserIfProfile(user.getIdentifier());
         if (userInfo != null && userInfo.isManagedProfile()) {
             return Resources.getSystem().getString(
@@ -782,6 +782,15 @@ public class UserManager {
     }
 
     /**
+     * Kept during L development to simplify updating unbundled apps.
+     * TODO: Remove after 2014-08-04
+     * @hide
+     */
+    public String getBadgedLabelForUser(String label, UserHandle user) {
+        return (String) getBadgedLabelForUser((CharSequence) label, user);
+    }
+
+    /**
      * If the target user is a managed profile of the calling user or the caller
      * is itself a managed profile, then this returns a drawable to use as a small
      * icon to include in a view to distinguish it from the original icon.