commit 52aa0636c6caef0bd2601fb1f4ec06a34d9ac7a2
author Adam Cohen <adamcohen@google.com> Tue Nov 26 12:23:01 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 26 12:23:01 2013 -0800
tree d0048bd84d553b186f52b30a13321f7fece7c9c5
parent 9710ec9d85566ea1edf973f3d51dda24f64bdaaf
parent d552dd90f1da32e1be2dd95ffed57c65d40cb651

am d552dd90: Fix NPE in Launcher onDestroy

* commit 'd552dd90f1da32e1be2dd95ffed57c65d40cb651':
  Fix NPE in Launcher onDestroy

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 3bd796b..5d1954e 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1878,7 +1878,7 @@
 
         mDragLayer.clearAllResizeFrames();
         ((ViewGroup) mWorkspace.getParent()).removeAllViews();
-        mWorkspace.removeAllViews();
+        mWorkspace.removeAllWorkspaceScreens();
         mWorkspace = null;
         mDragController = null;