diff options
| author | Winson Chung <winsonc@google.com> | 2015-07-31 20:08:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-31 20:08:57 +0000 |
| commit | e990d49534bb61606bcf3e61fa3c26e088d1b854 (patch) | |
| tree | ceedbcffef66a7f466458e9cda26359b03b44709 /src/com/android/launcher3/model/WidgetsModel.java | |
| parent | ec70312dea4083416d2d132ea8853455b0dec616 (diff) | |
| parent | eea022530496bb5f53f9ae01fdef0cd9d0e8147d (diff) | |
| download | android_packages_apps_Trebuchet-e990d49534bb61606bcf3e61fa3c26e088d1b854.tar.gz android_packages_apps_Trebuchet-e990d49534bb61606bcf3e61fa3c26e088d1b854.tar.bz2 android_packages_apps_Trebuchet-e990d49534bb61606bcf3e61fa3c26e088d1b854.zip | |
Merge "Fixing minor memory leak with name comparator." into ub-launcher3-burnaby
Diffstat (limited to 'src/com/android/launcher3/model/WidgetsModel.java')
| -rw-r--r-- | src/com/android/launcher3/model/WidgetsModel.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/launcher3/model/WidgetsModel.java b/src/com/android/launcher3/model/WidgetsModel.java index 185dfcae3..cabff148f 100644 --- a/src/com/android/launcher3/model/WidgetsModel.java +++ b/src/com/android/launcher3/model/WidgetsModel.java @@ -39,7 +39,7 @@ public class WidgetsModel { private ArrayList<Object> mRawList; private final AppWidgetManagerCompat mAppWidgetMgr; - private final Comparator mWidgetAndShortcutNameComparator; + private final WidgetsAndShortcutNameComparator mWidgetAndShortcutNameComparator; private final Comparator mAppNameComparator; private final IconCache mIconCache; private final AppFilter mAppFilter; @@ -103,6 +103,7 @@ public class WidgetsModel { // clear the lists. mWidgetsList.clear(); mPackageItemInfos.clear(); + mWidgetAndShortcutNameComparator.reset(); // add and update. for (Object o: rawWidgetsShortcuts) { @@ -139,7 +140,7 @@ public class WidgetsModel { if (widgetsShortcutsList != null) { widgetsShortcutsList.add(o); } else { - widgetsShortcutsList = new ArrayList<Object>(); + widgetsShortcutsList = new ArrayList<>(); widgetsShortcutsList.add(o); pInfo = new PackageItemInfo(packageName); mIconCache.getTitleAndIconForApp(packageName, userHandle, |