summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJoe Onorato <joeo@android.com>2010-06-11 18:15:14 (GMT)
committerAndroid Git Automerger <android-git-automerger@android.com>2010-06-11 18:15:14 (GMT)
commit8fc05199d6178976dcedaf29aba48ef02bce5c0d (patch)
treefaeee51d68f2310c742f2aa70c2358e2fbf2306f /src
parent9d944c6fb8c117674d1f02ca567629ab62add6b8 (diff)
parentab66ed2e067cbd1bc415b6cf66f3b5191b166461 (diff)
downloadandroid_packages_apps_Trebuchet-8fc05199d6178976dcedaf29aba48ef02bce5c0d.zip
android_packages_apps_Trebuchet-8fc05199d6178976dcedaf29aba48ef02bce5c0d.tar.gz
android_packages_apps_Trebuchet-8fc05199d6178976dcedaf29aba48ef02bce5c0d.tar.bz2
am ab66ed2e: Merge "This variable can be checked outside the lock because it\'s only set from the ui thread." into froyo
Merge commit 'ab66ed2e067cbd1bc415b6cf66f3b5191b166461' * commit 'ab66ed2e067cbd1bc415b6cf66f3b5191b166461': This variable can be checked outside the lock because it's only
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)