diff options
| author | Benjamin Franz <bfranz@google.com> | 2014-10-06 16:26:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-06 16:26:27 +0000 |
| commit | 31409c0ccd1434efdcfff8f7ddcd7c4207660104 (patch) | |
| tree | cff3be092507b7caab9ddd7441c0daf33d09e9f2 /core/java/android/widget | |
| parent | ce85d7f44f5c88dcc18a19738bfcd20d9dbb4a78 (diff) | |
| parent | ec2d48b96d1f95fb266914df294a27c210f8c3f5 (diff) | |
| download | frameworks_base-31409c0ccd1434efdcfff8f7ddcd7c4207660104.zip frameworks_base-31409c0ccd1434efdcfff8f7ddcd7c4207660104.tar.gz frameworks_base-31409c0ccd1434efdcfff8f7ddcd7c4207660104.tar.bz2 | |
Merge "Introduce new API to get an unbadged icon and unbadge permissions." into lmp-mr1-dev
Diffstat (limited to 'core/java/android/widget')
| -rw-r--r-- | core/java/android/widget/AppSecurityPermissions.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/widget/AppSecurityPermissions.java b/core/java/android/widget/AppSecurityPermissions.java index 10e56c7..5c05b5a 100644 --- a/core/java/android/widget/AppSecurityPermissions.java +++ b/core/java/android/widget/AppSecurityPermissions.java @@ -99,12 +99,12 @@ public class AppSecurityPermissions { public Drawable loadGroupIcon(PackageManager pm) { if (icon != 0) { - return loadIcon(pm); + return loadUnbadgedIcon(pm); } else { ApplicationInfo appInfo; try { appInfo = pm.getApplicationInfo(packageName, 0); - return appInfo.loadIcon(pm); + return appInfo.loadUnbadgedIcon(pm); } catch (NameNotFoundException e) { } } |