Fix 2583234 - It's ok for mCallbacks to be null.

Change-Id: Iec8df7b668a4657677f9c5421d00aa1b7df91015
This commit is contained in:
Joe Onorato
2010-04-13 17:19:18 -07:00
parent a588b878b9
commit ac03330c96

View File

@@ -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;