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

Commit aca99b60 authored by Rohit Goyal's avatar Rohit Goyal Committed by Android (Google) Code Review
Browse files

Merge "Bugfix: Add null safety when accessing icon database for main... 

Merge "Bugfix: Add null safety when accessing icon database for main activities for LoaderTask `loadAllApps`." into 24D1-dev
parents 8a85cb5c b313ac7a

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

+16 −11
Original line number Diff line number Diff line
@@ -469,6 +469,7 @@ public class IconCache extends BaseIconCache { 
                        duplicateIconRequestsMap.get(cn);



                if (cn != null) {

                    if (duplicateIconRequests != null) {

                        CacheEntry entry = cacheLocked(

                                cn,

                                /* user = */ sectionKey.first,
@@ -481,6 +482,10 @@ public class IconCache extends BaseIconCache { 
                        for (IconRequestInfo<T> iconRequest : duplicateIconRequests) {

                            applyCacheEntry(entry, iconRequest.itemInfo);

                        }

                    } else {

                        Log.e(TAG, "Found entry in icon database but no main activity "

                                + "entry for cn: " + cn);

                    }

                }

            }

        } catch (SQLiteException e) {