summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJoe Onorato <joeo@android.com>2010-06-11 17:54:31 (GMT)
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-06-11 17:54:31 (GMT)
commitab66ed2e067cbd1bc415b6cf66f3b5191b166461 (patch)
treec59b7b82f3d94632af7c0c3205a273422aff5302 /src
parentd0afc87d9639a228b247cfbc2cf19d16132137b3 (diff)
parent790c2d9fc5931bca04e6d28a6ccec16e4aea2024 (diff)
downloadandroid_packages_apps_Trebuchet-ab66ed2e067cbd1bc415b6cf66f3b5191b166461.zip
android_packages_apps_Trebuchet-ab66ed2e067cbd1bc415b6cf66f3b5191b166461.tar.gz
android_packages_apps_Trebuchet-ab66ed2e067cbd1bc415b6cf66f3b5191b166461.tar.bz2
Merge "This variable can be checked outside the lock because it's only set from the ui thread." into froyo
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher2/LauncherModel.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java
index 17cd151..17f7573 100644
--- a/src/com/android/launcher2/LauncherModel.java
+++ b/src/com/android/launcher2/LauncherModel.java
@@ -304,13 +304,13 @@ public class LauncherModel extends BroadcastReceiver {
ArrayList<ApplicationInfo> removed = null;
ArrayList<ApplicationInfo> modified = null;
- synchronized (mAllAppsListLock) {
- if (mBeforeFirstLoad) {
- // If we haven't even loaded yet, don't bother, since we'll just pick
- // up the changes.
- return;
- }
+ if (mBeforeFirstLoad) {
+ // If we haven't even loaded yet, don't bother, since we'll just pick
+ // up the changes.
+ return;
+ }
+ synchronized (mAllAppsListLock) {
final String action = intent.getAction();
if (Intent.ACTION_PACKAGE_CHANGED.equals(action)