summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPatrick Dubroy <dubroy@google.com>2010-07-26 19:10:10 (GMT)
committerPatrick Dubroy <dubroy@google.com>2010-07-26 19:15:55 (GMT)
commitab962b75eeb9f956ac2eb1b00e66f6cca492010e (patch)
tree041c6974c71306b921f3d44faf643536a19efebc /src
parent558654c6ec6eefa260e5a1c1c44fc6e13ec20473 (diff)
downloadandroid_packages_apps_Trebuchet-ab962b75eeb9f956ac2eb1b00e66f6cca492010e.zip
android_packages_apps_Trebuchet-ab962b75eeb9f956ac2eb1b00e66f6cca492010e.tar.gz
android_packages_apps_Trebuchet-ab962b75eeb9f956ac2eb1b00e66f6cca492010e.tar.bz2
fix 2869807: Crash on boot on trygon-userdebug
Change-Id: I59f0d653e498a69bd240232b8bb89884aa0c324d
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher2/Launcher.java11
1 files changed, 9 insertions, 2 deletions
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 @@ public final class Launcher extends Activity
// 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 @@ public final class Launcher extends Activity
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);
}