commit c82aa4cd1ea81c5fae7901bcb147df0ca082594b
author Adam Cohen <adamcohen@google.com> Fri Feb 14 20:38:15 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 14 20:38:15 2014 +0000
tree 155a8bca34754bb26ff8398b70b1b8b15fa2755d
parent 38ed22eb292f18f139f41b3b2bb87abcdd883c2d
parent 52aa0636c6caef0bd2601fb1f4ec06a34d9ac7a2

am 52aa0636: am d552dd90: Fix NPE in Launcher onDestroy

* commit '52aa0636c6caef0bd2601fb1f4ec06a34d9ac7a2':
  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;