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

Commit 5597e482 authored by Schneider Victor-tulias's avatar Schneider Victor-tulias
Browse files

Fix icon loading null pointer. 

Filtering out icon itemInfos with null component names when loading icons in bulk

Test: manual
Fixes: 220380324
Change-Id: I0e6f9ae0a363d17497207c92eadcac64ca42693f
parent daf801c6

src/com/android/launcher3/icons/IconCache.java

+11 −1
Original line number Diff line number Diff line
@@ -41,9 +41,9 @@ import android.os.Trace; 
import android.os.UserHandle;

import android.text.TextUtils;

import android.util.Log;

import android.util.Pair;



import androidx.annotation.NonNull;

import androidx.core.util.Pair;



import com.android.launcher3.InvariantDeviceProfile;

import com.android.launcher3.LauncherFiles;
@@ -339,6 +339,16 @@ public class IconCache extends BaseIconCache { 
            List<IconRequestInfo<T>> iconRequestInfos) {

        Map<Pair<UserHandle, Boolean>, List<IconRequestInfo<T>>> iconLoadSubsectionsMap =

                iconRequestInfos.stream()

                        .filter(iconRequest -> {

                            if (iconRequest.itemInfo.getTargetComponent() != null) {

                                return true;

                            }

                            Log.i(TAG,

                                    "Skipping Item info with null component name: "

                                            + iconRequest.itemInfo);

                            iconRequest.itemInfo.bitmap = getDefaultIcon(iconRequest.itemInfo.user);

                            return false;

                        })

                        .collect(groupingBy(iconRequest ->

                                Pair.create(iconRequest.itemInfo.user, iconRequest.useLowResIcon)));