am d9b5ffbc: Merge "Revert "Remove String version of getBadgedLabel"" into lmp-dev (10f171ff) · Commits · e / os / android_frameworks_base

core/java/android/os/UserManager.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -863,6 +863,15 @@ public class UserManager {
		return label;
		}

		/**
		* 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