summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher2
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2011-08-31 20:59:26 -0700
committerMichael Jurka <mikejurka@google.com>2011-08-31 20:59:26 -0700
commit83df188ce0822f4058406e5f2878d1cf34bf413e (patch)
tree7964efa1913bd07234b3d5564183f3a53c95ba86 /src/com/android/launcher2
parent82aef76fe31ed7fdd9fa222f05ee6ef7e027c045 (diff)
downloadandroid_packages_apps_Trebuchet-83df188ce0822f4058406e5f2878d1cf34bf413e.tar.gz
android_packages_apps_Trebuchet-83df188ce0822f4058406e5f2878d1cf34bf413e.tar.bz2
android_packages_apps_Trebuchet-83df188ce0822f4058406e5f2878d1cf34bf413e.zip
Execute update operations immediately if on right thread
- Potential fix to bug 5205131 Change-Id: Iae302f81e4c8f5c07dc4363b3bb9ef298a33faf4
Diffstat (limited to 'src/com/android/launcher2')
-rw-r--r--src/com/android/launcher2/LauncherModel.java9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java
index ea51d0169..239970e84 100644
--- a/src/com/android/launcher2/LauncherModel.java
+++ b/src/com/android/launcher2/LauncherModel.java
@@ -465,7 +465,7 @@ public class LauncherModel extends BroadcastReceiver {
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 @@ public class LauncherModel extends BroadcastReceiver {
throw new RuntimeException(msg);
}
}
- });
+ };
+ if (sWorkerThread.getThreadId() == Process.myTid()) {
+ r.run();
+ } else {
+ sWorker.post(r);
+ }
}
/**