diff options
| author | Kenny Guy <kennyguy@google.com> | 2015-06-08 12:34:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-08 12:34:26 +0000 |
| commit | a73e4599506a1d3498ef5e9c240d79d7125fd2e9 (patch) | |
| tree | 34c705db3d661ff23a90a4340647cee74ee751c0 /core/java | |
| parent | 7d3b8833df5857f5cc70d6c101abe7501fa22b49 (diff) | |
| parent | df77d717c33584f8fa04cb3780af68d38269cdf5 (diff) | |
| download | frameworks_base-a73e4599506a1d3498ef5e9c240d79d7125fd2e9.zip frameworks_base-a73e4599506a1d3498ef5e9c240d79d7125fd2e9.tar.gz frameworks_base-a73e4599506a1d3498ef5e9c240d79d7125fd2e9.tar.bz2 | |
Merge "Correct the docs for getUserBadgedIcon" into mnc-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 45245e4..c016ac3 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -3274,10 +3274,11 @@ public abstract class PackageManager { throws NameNotFoundException; /** - * If the target user is a managed profile of the calling user or the caller - * is itself a managed profile, then this returns a badged copy of the given - * icon to be able to distinguish it from the original icon. For badging an - * arbitrary drawable use {@link #getUserBadgedDrawableForDensity( + * If the target user is a managed profile of the calling user or if the + * target user is the caller and is itself a managed profile, then this + * returns a badged copy of the given icon to be able to distinguish it from + * the original icon. For badging an arbitrary drawable use + * {@link #getUserBadgedDrawableForDensity( * android.graphics.drawable.Drawable, UserHandle, android.graphics.Rect, int)}. * <p> * If the original drawable is a BitmapDrawable and the backing bitmap is |