diff options
| author | Adam Cohen <adamcohen@google.com> | 2013-11-26 11:50:15 -0800 |
|---|---|---|
| committer | Dan Sandler <dsandler@android.com> | 2013-11-26 19:52:58 +0000 |
| commit | 37c717ffa626c6690ea45ba88e5dfc9bea39ed6e (patch) | |
| tree | 06742ec136d3f5942d8ac739975eb9f2f4db441e /src | |
| parent | 04a231bbe44e9af184e76f124430a5bf7ae8ac8a (diff) | |
| download | android_packages_apps_Trebuchet-37c717ffa626c6690ea45ba88e5dfc9bea39ed6e.tar.gz android_packages_apps_Trebuchet-37c717ffa626c6690ea45ba88e5dfc9bea39ed6e.tar.bz2 android_packages_apps_Trebuchet-37c717ffa626c6690ea45ba88e5dfc9bea39ed6e.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 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(); |