commit e7a4283415c52d17988dcc80a35731044b88ab34
author Adam Cohen <adamcohen@google.com> Fri Feb 14 21:02:00 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 14 21:02:00 2014 +0000
tree 67c0a5f8c92e7449b8eac1dd4e18fda01989a5d7
parent 155b2624888b2898ef35d6bd80228d83cb39bc91
parent 53b995f00c84d6ed9f10d4e8ddd0f38a33072af9

am 53b995f0: am c82aa4cd: am 52aa0636: am d552dd90: Fix NPE in Launcher onDestroy

* commit '53b995f00c84d6ed9f10d4e8ddd0f38a33072af9':
  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;