diff options
| author | Adam Cohen <adamcohen@google.com> | 2012-04-30 16:21:03 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-04-30 16:21:03 -0700 |
| commit | 77ebbe4beeb952779f41c38e6a55fd03655a29dd (patch) | |
| tree | 30f2f47026e14ca4922782ba91beaea370bfbbe4 | |
| parent | dff8fbe8c86dd841df7937a7d2240c445f187d72 (diff) | |
| parent | accf3bffedc736c04034bfee8e1a8e4fe775f568 (diff) | |
| download | android_packages_apps_Trebuchet-77ebbe4beeb952779f41c38e6a55fd03655a29dd.tar.gz android_packages_apps_Trebuchet-77ebbe4beeb952779f41c38e6a55fd03655a29dd.tar.bz2 android_packages_apps_Trebuchet-77ebbe4beeb952779f41c38e6a55fd03655a29dd.zip | |
am accf3bff: Fix NPE when rotating with widget frame visible (issue 6391782)
* commit 'accf3bffedc736c04034bfee8e1a8e4fe775f568':
Fix NPE when rotating with widget frame visible (issue 6391782)
| -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; |