fix 2869807: Crash on boot on trygon-userdebug

Change-Id: I59f0d653e498a69bd240232b8bb89884aa0c324d
This commit is contained in:
Patrick Dubroy 2010-07-26 12:10:10 -07:00
parent 558654c6ec
commit ab962b75ee
1 changed files with 9 additions and 2 deletions

View File

@ -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);
}