Merge "Fix NPE" into ics-mr0

This commit is contained in:
Winson Chung
2011-10-14 14:10:41 -07:00
committed by Android (Google) Code Review

View File

@@ -246,7 +246,9 @@ public final class Launcher extends Activity
private Runnable mBuildLayersRunnable = new Runnable() {
public void run() {
mWorkspace.buildPageHardwareLayers();
if (mWorkspace != null) {
mWorkspace.buildPageHardwareLayers();
}
}
};
@@ -1260,6 +1262,7 @@ public final class Launcher extends Activity
// Remove all pending runnables
mHandler.removeMessages(ADVANCE_MSG);
mHandler.removeMessages(0);
mWorkspace.removeCallbacks(mBuildLayersRunnable);
// Stop callbacks from LauncherModel
LauncherApplication app = ((LauncherApplication) getApplication());