diff options
| author | Adam Cohen <adamcohen@google.com> | 2013-11-26 19:57:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-26 19:57:10 +0000 |
| commit | 060a48378f21a6b5836990a23178d02c94fccc60 (patch) | |
| tree | 12dc324284c25ee8c2b423b25394c3c109d3a285 /src | |
| parent | a6a296ba1ffba6c5b98e92f05254f0317f28290b (diff) | |
| parent | 37c717ffa626c6690ea45ba88e5dfc9bea39ed6e (diff) | |
| download | android_packages_apps_Trebuchet-060a48378f21a6b5836990a23178d02c94fccc60.tar.gz android_packages_apps_Trebuchet-060a48378f21a6b5836990a23178d02c94fccc60.tar.bz2 android_packages_apps_Trebuchet-060a48378f21a6b5836990a23178d02c94fccc60.zip | |
Merge "Fix NPE in case where workspace is null because Launcher has been destroyed " into jb-ub-now-jolly-elf
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 7d84a3c88..ce6b20e03 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -2663,7 +2663,7 @@ public class Launcher extends Activity } public void closeFolder() { - Folder folder = mWorkspace.getOpenFolder(); + Folder folder = mWorkspace != null ? mWorkspace.getOpenFolder() : null; if (folder != null) { if (folder.isEditingName()) { folder.dismissEditingName(); |