commit eb95dde9d6b5f81832225dd0d2f78adfb378815b
author Winson Chung <winsonc@google.com> Mon Oct 17 07:07:00 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 17 07:07:00 2011 -0700
tree 900b94775a8bb5394b86d09f17da9357e29213fb
parent 07b3b2f11ff35002f7353551185d8f31df0ed3a4
parent ea45c2cb53b4d745f43850dcc4e794748425c5df

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

* commit 'ea45c2cb53b4d745f43850dcc4e794748425c5df':
  Fix NPE

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 59efc9e..6959281 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -246,7 +246,9 @@
 
     private Runnable mBuildLayersRunnable = new Runnable() {
         public void run() {
-            mWorkspace.buildPageHardwareLayers();
+            if (mWorkspace != null) {
+                mWorkspace.buildPageHardwareLayers();
+            }
         }
     };
 
@@ -1260,6 +1262,7 @@
         // Remove all pending runnables
         mHandler.removeMessages(ADVANCE_MSG);
         mHandler.removeMessages(0);
+        mWorkspace.removeCallbacks(mBuildLayersRunnable);
 
         // Stop callbacks from LauncherModel
         LauncherApplication app = ((LauncherApplication) getApplication());