diff options
author | Joe Onorato <joeo@android.com> | 2010-06-11 11:15:14 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-11 11:15:14 -0700 |
commit | 8fc05199d6178976dcedaf29aba48ef02bce5c0d (patch) | |
tree | faeee51d68f2310c742f2aa70c2358e2fbf2306f /src/com | |
parent | 9d944c6fb8c117674d1f02ca567629ab62add6b8 (diff) | |
parent | ab66ed2e067cbd1bc415b6cf66f3b5191b166461 (diff) | |
download | android_packages_apps_Trebuchet-8fc05199d6178976dcedaf29aba48ef02bce5c0d.tar.gz android_packages_apps_Trebuchet-8fc05199d6178976dcedaf29aba48ef02bce5c0d.tar.bz2 android_packages_apps_Trebuchet-8fc05199d6178976dcedaf29aba48ef02bce5c0d.zip |
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/com')
-rw-r--r-- | src/com/android/launcher2/LauncherModel.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java index 17cd15101..17f75732a 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) |