commit accf3bffedc736c04034bfee8e1a8e4fe775f568
author Adam Cohen <adamcohen@google.com> Mon Apr 30 16:07:43 2012 -0700
committer Adam Cohen <adamcohen@google.com> Mon Apr 30 16:10:53 2012 -0700
tree 30f2f47026e14ca4922782ba91beaea370bfbbe4
parent de33bf03a2fc14431807626c33e0c698370749e9

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

Change-Id: I67e8abf34c6ced447763fd3777c23773225ac5b5

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index ca6db85..cb737ff 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1156,7 +1156,6 @@
     public void onDetachedFromWindow() {
         super.onDetachedFromWindow();
         mVisible = false;
-        mDragLayer.clearAllResizeFrames();
 
         if (mAttached) {
             unregisterReceiver(mReceiver);
@@ -1397,6 +1396,7 @@
         getContentResolver().unregisterContentObserver(mWidgetObserver);
         unregisterReceiver(mCloseSystemDialogsReceiver);
 
+        mDragLayer.clearAllResizeFrames();
         ((ViewGroup) mWorkspace.getParent()).removeAllViews();
         mWorkspace.removeAllViews();
         mWorkspace = null;