am ea45c2cb: Merge "Fix NPE" into ics-mr0

* commit 'ea45c2cb53b4d745f43850dcc4e794748425c5df':
  Fix NPE

src/com/android/launcher2/Launcher.java

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