diff options
| author | Adam Cohen <adamcohen@google.com> | 2013-11-26 11:50:15 -0800 |
|---|---|---|
| committer | Danesh M <daneshm90@gmail.com> | 2014-06-06 22:54:20 -0700 |
| commit | 10bab325228d6498ea2898d9d7632c42b722c753 (patch) | |
| tree | 0bbe90c1d2f021baadafb1c106c9fc5b92c29a18 /src | |
| parent | 449e6bb5e22109f780b0c5c1017d88d022b5211d (diff) | |
| download | android_packages_apps_Trebuchet-10bab325228d6498ea2898d9d7632c42b722c753.tar.gz android_packages_apps_Trebuchet-10bab325228d6498ea2898d9d7632c42b722c753.tar.bz2 android_packages_apps_Trebuchet-10bab325228d6498ea2898d9d7632c42b722c753.zip | |
Fix NPE in case where workspace is null because Launcher has been destroyed
Bug: 11765964
Change-Id: Iacd4db712c09940c05ccd2a64b25e376b63c6aee
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 b7efdb5d3..8ae1bd55b 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -2859,7 +2859,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(); |