commit ea45c2cb53b4d745f43850dcc4e794748425c5df
author Winson Chung <winsonc@google.com> Fri Oct 14 14:10:41 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 14 14:10:41 2011 -0700
tree 92d1badcd0c3cd0b9d1de716ffdf95aa2adf6c1a
parent d2c1f80aa73bef9d7fb5991ec29ea7a7b2e38f90
parent 9d906c7742af73160df257a40a702e1cc4f87899

Merge "Fix NPE" into ics-mr0

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 0ed5129..dc7b77e 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());