summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2013-11-26 12:23:01 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-26 12:23:01 -0800
commit52aa0636c6caef0bd2601fb1f4ec06a34d9ac7a2 (patch)
treed0048bd84d553b186f52b30a13321f7fece7c9c5 /src
parent9710ec9d85566ea1edf973f3d51dda24f64bdaaf (diff)
parentd552dd90f1da32e1be2dd95ffed57c65d40cb651 (diff)
downloadandroid_packages_apps_Trebuchet-52aa0636c6caef0bd2601fb1f4ec06a34d9ac7a2.tar.gz
android_packages_apps_Trebuchet-52aa0636c6caef0bd2601fb1f4ec06a34d9ac7a2.tar.bz2
android_packages_apps_Trebuchet-52aa0636c6caef0bd2601fb1f4ec06a34d9ac7a2.zip
am d552dd90: Fix NPE in Launcher onDestroy
* commit 'd552dd90f1da32e1be2dd95ffed57c65d40cb651': Fix NPE in Launcher onDestroy
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/Launcher.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 3bd796b15..5d1954e45 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1878,7 +1878,7 @@ public class Launcher extends Activity
mDragLayer.clearAllResizeFrames();
((ViewGroup) mWorkspace.getParent()).removeAllViews();
- mWorkspace.removeAllViews();
+ mWorkspace.removeAllWorkspaceScreens();
mWorkspace = null;
mDragController = null;