diff options
| author | Joe Onorato <joeo@android.com> | 2010-04-15 06:36:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-15 06:36:01 -0700 |
| commit | 5435ff76ebefe50dfeeaaf5bda7fd25d721af14d (patch) | |
| tree | 3df326077c18824f08004e1a51372cfce812688c /src/com | |
| parent | ec1c50ab4f0a986b70cccbebc0bc2dd05f8918b4 (diff) | |
| parent | ac03330c9684f98b4dd067a87ca70d3e0be1cfed (diff) | |
| download | android_packages_apps_Trebuchet-5435ff76ebefe50dfeeaaf5bda7fd25d721af14d.tar.gz android_packages_apps_Trebuchet-5435ff76ebefe50dfeeaaf5bda7fd25d721af14d.tar.bz2 android_packages_apps_Trebuchet-5435ff76ebefe50dfeeaaf5bda7fd25d721af14d.zip | |
am ac03330c: Fix 2583234 - It\'s ok for mCallbacks to be null.
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/launcher2/LauncherModel.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java index 72675b94d..5e1abe6c2 100644 --- a/src/com/android/launcher2/LauncherModel.java +++ b/src/com/android/launcher2/LauncherModel.java @@ -432,7 +432,7 @@ public class LauncherModel extends BroadcastReceiver { Log.d(TAG, "startLoader isLaunching=" + isLaunching); } // Don't bother to start the thread if we know it's not going to do anything - if (mCallbacks.get() != null) { + if (mCallbacks != null && mCallbacks.get() != null) { LoaderThread oldThread = mLoaderThread; if (oldThread != null) { if (oldThread.isLaunching()) { @@ -635,6 +635,10 @@ public class LauncherModel extends BroadcastReceiver { return null; } + if (mCallbacks == null) { + return null; + } + final Callbacks callbacks = mCallbacks.get(); if (callbacks != oldCallbacks) { return null; |