Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33622a03 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Guard against the NPE in setPreferenceIcon()" into tm-dev am: cce3381e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447101



Change-Id: I6f935808fd9d0e4344016fbcc898d8e1df9daeab
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d2631c30 cce3381e

src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java

+5 −0
Original line number Diff line number Diff line
@@ -422,6 +422,11 @@ public class DashboardFeatureProviderImpl implements DashboardFeatureProvider { 
    private void setPreferenceIcon(Preference preference, Tile tile, boolean forceRoundedIcon,

            String iconPackage, Icon icon) {

        Drawable iconDrawable = icon.loadDrawable(preference.getContext());

        if (iconDrawable == null) {

            Log.w(TAG, "Set null preference icon for: " + iconPackage);

            preference.setIcon(null);

            return;

        }

        if (TextUtils.equals(tile.getCategory(), CategoryKey.CATEGORY_HOMEPAGE)) {

            iconDrawable.setTint(Utils.getHomepageIconColor(preference.getContext()));

        } else if (forceRoundedIcon && !TextUtils.equals(mContext.getPackageName(), iconPackage)) {