Fix launcher2 crash. We weren't initializing the list of folders. Bug 2210545.
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 36d7da1..6cccb77 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -66,6 +66,7 @@
import android.appwidget.AppWidgetProviderInfo;
import java.util.ArrayList;
+import java.util.Map.Entry;
import java.util.HashMap;
import java.io.DataOutputStream;
import java.io.FileNotFoundException;
@@ -1841,7 +1842,8 @@
/**
* Implementation of the method from LauncherModel.Callbacks.
*/
- void bindFolders(HashMap<Long, FolderInfo> folders) {
+ public void bindFolders(HashMap<Long, FolderInfo> folders) {
+ mFolders.clear();
mFolders.putAll(folders);
}