am accf3bff: Fix NPE when rotating with widget frame visible (issue 6391782)

* commit 'accf3bffedc736c04034bfee8e1a8e4fe775f568':
  Fix NPE when rotating with widget frame visible (issue 6391782)
This commit is contained in:
Adam Cohen
2012-04-30 16:21:03 -07:00
committed by Android Git Automerger
+1 -1
View File
@@ -1156,7 +1156,6 @@ public final class Launcher extends Activity
public void onDetachedFromWindow() {
super.onDetachedFromWindow();
mVisible = false;
mDragLayer.clearAllResizeFrames();
if (mAttached) {
unregisterReceiver(mReceiver);
@@ -1397,6 +1396,7 @@ public final class Launcher extends Activity
getContentResolver().unregisterContentObserver(mWidgetObserver);
unregisterReceiver(mCloseSystemDialogsReceiver);
mDragLayer.clearAllResizeFrames();
((ViewGroup) mWorkspace.getParent()).removeAllViews();
mWorkspace.removeAllViews();
mWorkspace = null;