aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-27 23:36:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Preventing nullpointer exception when cloning rawList

Browse Source 
Bug: 24299525
Change-Id: I92018a3da7d75afc2c6997302f8e0492eb78e62f
This commit is contained in:
Sunny Goyal
2015-09-22 16:56:55 -07:00
parent b3fff9d98a
commit 6a706b1dd7
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/android/launcher3/model/WidgetsModel.java
View File

@@ -34,19 +34,19 @@ public class WidgetsModel {
private static final boolean DEBUG = false;
/* List of packages that is tracked by this model. */
private ArrayList<PackageItemInfo> mPackageItemInfos = new ArrayList<>();
private final ArrayList<PackageItemInfo> mPackageItemInfos;
/* Map of widgets and shortcuts that are tracked per package. */
private HashMap<PackageItemInfo, ArrayList<Object>> mWidgetsList = new HashMap<>();
private ArrayList<Object> mRawList;
private final HashMap<PackageItemInfo, ArrayList<Object>> mWidgetsList;
private final AppWidgetManagerCompat mAppWidgetMgr;
private final WidgetsAndShortcutNameComparator mWidgetAndShortcutNameComparator;
private final Comparator<ItemInfo> mAppNameComparator;
private final IconCache mIconCache;
private final AppFilter mAppFilter;
private AlphabeticIndexCompat mIndexer;
private final AlphabeticIndexCompat mIndexer;
private ArrayList<Object> mRawList;
public WidgetsModel(Context context, IconCache iconCache, AppFilter appFilter) {
mAppWidgetMgr = AppWidgetManagerCompat.getInstance(context);
@@ -55,6 +55,10 @@ public class WidgetsModel {
mIconCache = iconCache;
mAppFilter = appFilter;
mIndexer = new AlphabeticIndexCompat(context);
mPackageItemInfos = new ArrayList<>();
mWidgetsList = new HashMap<>();
mRawList = new ArrayList<>();
}
@SuppressWarnings("unchecked")
@@ -62,18 +66,16 @@ public class WidgetsModel {
mAppWidgetMgr = model.mAppWidgetMgr;
mPackageItemInfos = (ArrayList<PackageItemInfo>) model.mPackageItemInfos.clone();
mWidgetsList = (HashMap<PackageItemInfo, ArrayList<Object>>) model.mWidgetsList.clone();
mRawList = (ArrayList<Object>) model.mRawList.clone();
mWidgetAndShortcutNameComparator = model.mWidgetAndShortcutNameComparator;
mAppNameComparator = model.mAppNameComparator;
mIconCache = model.mIconCache;
mAppFilter = model.mAppFilter;
mIndexer = model.mIndexer;
mRawList = (ArrayList<Object>) model.mRawList.clone();
}
// Access methods that may be deleted if the private fields are made package-private.
public int getPackageSize() {
if (mPackageItemInfos == null) {
return 0;
}
return mPackageItemInfos.size();
}