Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 0a1fb150: am 26587478: am 84201f75: Merge "Revert "Revert "Remove String version of getBadgedLabel""" into lmp-dev

Browse Source 
* commit '0a1fb150ace167ddc1b15997a1199be32ef5420d':
  Revert "Revert "Remove String version of getBadgedLabel""
This commit is contained in:
Kenny Guy
2014-08-08 02:24:05 +00:00
committed by Android Git Automerger
parent 49c50729a7 b06fbf3af7
commit 6150dbb74a
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/os/UserManager.java
View File

@@ -863,15 +863,6 @@ 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