commit 603bcb91a091d0f4512fdfb92d6df3c6f9fa8059
author Winson Chung <winsonc@google.com> Fri Sep 02 11:45:39 2011 -0700
committer Winson Chung <winsonc@google.com> Fri Sep 02 17:07:46 2011 -0700
tree a7953c5834878c79911e423c9cccc17affe8299d
parent 4512637a8a38610282caafe1335a67073dda8224

Prevent accessing LauncherModel data structures on main thread. (5220358)

Change-Id: Ib9de96abb0ab13ef63b9c594f6982368fd1b614f

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 637d956..8bbf902 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1602,7 +1602,9 @@
      * leak the previous Home screen on orientation change.
      */
     private void unbindWorkspaceAndHotseatItems() {
-        LauncherModel.unbindWorkspaceItems();
+        if (mModel != null) {
+            mModel.unbindWorkspaceItems();
+        }
     }
 
     /**
@@ -2754,9 +2756,6 @@
         if (mHotseat != null) {
             mHotseat.resetLayout();
         }
-
-        // This wasn't being called before which resulted in a leak of AppWidgetHostViews
-        unbindWorkspaceAndHotseatItems();
     }
 
     /**