diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-09-23 18:43:52 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-23 18:43:52 +0000 |
commit | 2924080923189c1ec125ca877f6cc75982f215ba (patch) | |
tree | 398213ed012bb0167ddae59779a80bda38555592 /src/com/android/launcher3/model | |
parent | fa20fff5ca8dbc5158cd99db063b1a850b047617 (diff) | |
parent | 4c67dce43f6e4f535bfe9c6d804db0822ac6db9d (diff) | |
download | android_packages_apps_Trebuchet-2924080923189c1ec125ca877f6cc75982f215ba.tar.gz android_packages_apps_Trebuchet-2924080923189c1ec125ca877f6cc75982f215ba.tar.bz2 android_packages_apps_Trebuchet-2924080923189c1ec125ca877f6cc75982f215ba.zip |
am 4c67dce4: am ce0a8946: Merge "Preventing nullpointer exception when cloning rawList" into ub-launcher3-burnaby
* commit '4c67dce43f6e4f535bfe9c6d804db0822ac6db9d':
Preventing nullpointer exception when cloning rawList
Diffstat (limited to 'src/com/android/launcher3/model')
-rw-r--r-- | src/com/android/launcher3/model/WidgetsModel.java | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/com/android/launcher3/model/WidgetsModel.java b/src/com/android/launcher3/model/WidgetsModel.java index eef4f9173..99a53ff36 100644 --- a/src/com/android/launcher3/model/WidgetsModel.java +++ b/src/com/android/launcher3/model/WidgetsModel.java @@ -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(); } |