commit ab962b75eeb9f956ac2eb1b00e66f6cca492010e
author Patrick Dubroy <dubroy@google.com> Mon Jul 26 12:10:10 2010 -0700
committer Patrick Dubroy <dubroy@google.com> Mon Jul 26 12:15:55 2010 -0700
tree 041c6974c71306b921f3d44faf643536a19efebc
parent 558654c6ec6eefa260e5a1c1c44fc6e13ec20473

fix 2869807: Crash on boot on trygon-userdebug

Change-Id: I59f0d653e498a69bd240232b8bb89884aa0c324d

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 43b12ed..f846b51 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -621,6 +621,8 @@
         // Some launcher layouts don't have a previous and next view
         if (mPreviousView != null) {
             dismissPreview(mPreviousView);
+        }
+        if (mNextView != null) {
             dismissPreview(mNextView);
         }
         mDragController.cancelDrag();
@@ -1126,8 +1128,13 @@
 
         getContentResolver().unregisterContentObserver(mWidgetObserver);
 
-        dismissPreview(mPreviousView);
-        dismissPreview(mNextView);
+        // Some launcher layouts don't have a previous and next view
+        if (mPreviousView != null) {
+            dismissPreview(mPreviousView);
+        }
+        if (mNextView != null) {
+            dismissPreview(mNextView);
+        }
 
         unregisterReceiver(mCloseSystemDialogsReceiver);
     }