diff options
| author | Adam Cohen <adamcohen@google.com> | 2012-04-30 16:07:43 -0700 |
|---|---|---|
| committer | Adam Cohen <adamcohen@google.com> | 2012-04-30 16:10:53 -0700 |
| commit | accf3bffedc736c04034bfee8e1a8e4fe775f568 (patch) | |
| tree | 30f2f47026e14ca4922782ba91beaea370bfbbe4 | |
| parent | de33bf03a2fc14431807626c33e0c698370749e9 (diff) | |
| download | android_packages_apps_Trebuchet-accf3bffedc736c04034bfee8e1a8e4fe775f568.tar.gz android_packages_apps_Trebuchet-accf3bffedc736c04034bfee8e1a8e4fe775f568.tar.bz2 android_packages_apps_Trebuchet-accf3bffedc736c04034bfee8e1a8e4fe775f568.zip | |
Fix NPE when rotating with widget frame visible (issue 6391782)
Change-Id: I67e8abf34c6ced447763fd3777c23773225ac5b5
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 2 |
1 files changed, 1 insertions, 1 deletions
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; |