commit a13a2f2a7bd0550d1ad973f760ff25e1a4137c43
author Adam Cohen <adamcohen@google.com> Mon Jul 23 14:29:15 2012 -0700
committer Adam Cohen <adamcohen@google.com> Mon Jul 23 14:29:15 2012 -0700
tree cd7b43b0015ec0e0692e9deb9f6ad11f6873ac6e
parent 36e6c5bb232f3a876753b91fb9ec604cda8664a5

Fixing issue where defered unbind was running after synchronous bind. (Bug 6858398, Bug 6863181)

Change-Id: I03dc3ae18528901cc88c79638a8495c1ab8d61af

src/com/android/launcher2/LauncherModel.java

diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java
index d4b7f76..ab29fc6 100644
--- a/src/com/android/launcher2/LauncherModel.java
+++ b/src/com/android/launcher2/LauncherModel.java
@@ -918,6 +918,11 @@
             //      data structures, we can't allow any other thread to touch that data, but because
             //      this call is synchronous, we can get away with not locking).
 
+            // The LauncherModel is static in the LauncherApplication and mHandler may have queued
+            // operations from the previous activity.  We need to ensure that all queued operations
+            // are executed before any synchronous binding work is done.
+            mHandler.flush();
+
             // Divide the set of loaded items into those that we are binding synchronously, and
             // everything else that is to be bound normally (asynchronously).
             bindWorkspace(synchronousBindPage);