diff options
| author | Amith Yamasani <yamasani@google.com> | 2013-05-20 17:40:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-20 17:40:52 -0700 |
| commit | c46a41cd5ae1c4ae1d8b86d1b47827ec74a8ed11 (patch) | |
| tree | e84c367ade41a4d1d908a09b03a128ad54297a6f /src/com/android/settings/users | |
| parent | 405959f44a7f5f939a69dfedc9c1621c5fbd2072 (diff) | |
| parent | 738c373f3a27f30d631881c1633cca343e512e8f (diff) | |
| download | packages_apps_Settings-c46a41cd5ae1c4ae1d8b86d1b47827ec74a8ed11.tar.gz packages_apps_Settings-c46a41cd5ae1c4ae1d8b86d1b47827ec74a8ed11.tar.bz2 packages_apps_Settings-c46a41cd5ae1c4ae1d8b86d1b47827ec74a8ed11.zip | |
am 738c373f: am f88e6e5a: Don\'t mutate all instances of app icons in Settings
* commit '738c373f3a27f30d631881c1633cca343e512e8f':
Don't mutate all instances of app icons in Settings
Diffstat (limited to 'src/com/android/settings/users')
| -rw-r--r-- | src/com/android/settings/users/AppRestrictionsFragment.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/com/android/settings/users/AppRestrictionsFragment.java index 0821e1572..bfcc677e0 100644 --- a/src/com/android/settings/users/AppRestrictionsFragment.java +++ b/src/com/android/settings/users/AppRestrictionsFragment.java @@ -581,7 +581,7 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen final boolean isSettingsApp = packageName.equals(context.getPackageName()); AppRestrictionsPreference p = new AppRestrictionsPreference(context, this); final boolean hasSettings = resolveInfoListHasPackage(receivers, packageName); - p.setIcon(app.icon); + p.setIcon(app.icon != null ? app.icon.mutate() : null); p.setChecked(false); p.setTitle(app.activityName); if (app.masterEntry != null) { |