commit 83df188ce0822f4058406e5f2878d1cf34bf413e
author Michael Jurka <mikejurka@google.com> Wed Aug 31 20:59:26 2011 -0700
committer Michael Jurka <mikejurka@google.com> Wed Aug 31 20:59:26 2011 -0700
tree 7964efa1913bd07234b3d5564183f3a53c95ba86
parent 82aef76fe31ed7fdd9fa222f05ee6ef7e027c045

Execute update operations immediately if on right thread

- Potential fix to bug 5205131

Change-Id: Iae302f81e4c8f5c07dc4363b3bb9ef298a33faf4

src/com/android/launcher2/LauncherModel.java

diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java
index ea51d01..239970e 100644
--- a/src/com/android/launcher2/LauncherModel.java
+++ b/src/com/android/launcher2/LauncherModel.java
@@ -465,7 +465,7 @@
         item.onAddToDatabase(values);
         item.updateValuesWithCoordinates(values, item.cellX, item.cellY);
 
-        sWorker.post(new Runnable() {
+        Runnable r = new Runnable() {
             public void run() {
                 cr.update(LauncherSettings.Favorites.getContentUri(item.id, false),
                         values, null, null);
@@ -481,7 +481,12 @@
                     throw new RuntimeException(msg);
                 }
             }
-        });
+        };
+        if (sWorkerThread.getThreadId() == Process.myTid()) {
+            r.run();
+        } else {
+            sWorker.post(r);
+        }
     }
 
     /**