PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2022-05-18 13:47:47 +00:00
committed by Android (Google) Code Review
parent 1cf78b8b83 65d46ee179
commit cce3381ed4
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
View File

@@ -422,6 +422,11 @@ public class DashboardFeatureProviderImpl implements DashboardFeatureProvider {
private void setPreferenceIcon(Preference preference, Tile tile, boolean forceRoundedIcon, private void setPreferenceIcon(Preference preference, Tile tile, boolean forceRoundedIcon,
String iconPackage, Icon icon) { String iconPackage, Icon icon) {
Drawable iconDrawable = icon.loadDrawable(preference.getContext()); 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)) { if (TextUtils.equals(tile.getCategory(), CategoryKey.CATEGORY_HOMEPAGE)) {
iconDrawable.setTint(Utils.getHomepageIconColor(preference.getContext())); iconDrawable.setTint(Utils.getHomepageIconColor(preference.getContext()));
} else if (forceRoundedIcon && !TextUtils.equals(mContext.getPackageName(), iconPackage)) { } else if (forceRoundedIcon && !TextUtils.equals(mContext.getPackageName(), iconPackage)) {