From 9d906c7742af73160df257a40a702e1cc4f87899 Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Fri, 14 Oct 2011 06:25:36 -0700
Subject: Fix NPE

Bug # 5455516

Change-Id: I61617d47d1275cfb983adb07e77b8293eb26a763
---
 src/com/android/launcher2/Launcher.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 72ac3907..0d6a286c 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/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();
+            }
         }
     };
 
@@ -1259,6 +1261,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());
-- 
cgit v1.2.3