From accf3bffedc736c04034bfee8e1a8e4fe775f568 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Mon, 30 Apr 2012 16:07:43 -0700
Subject: Fix NPE when rotating with widget frame visible (issue 6391782)

Change-Id: I67e8abf34c6ced447763fd3777c23773225ac5b5
---
 src/com/android/launcher2/Launcher.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index ca6db858d..cb737ff69 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -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;
-- 
cgit v1.2.3