diff options
| author | Michael Jurka <mikejurka@google.com> | 2012-11-16 18:21:22 -0800 |
|---|---|---|
| committer | Michael Jurka <mikejurka@google.com> | 2012-11-16 18:21:22 -0800 |
| commit | ffc2682a9784e03d7cc9943f4f408255f8468b96 (patch) | |
| tree | efb9c1dff67167d93aa6a3d5c19968786593710b /src | |
| parent | 360310b74de10d7bd2cc0a2ab874b1d246a6a7ba (diff) | |
| download | android_packages_apps_Trebuchet-ffc2682a9784e03d7cc9943f4f408255f8468b96.tar.gz android_packages_apps_Trebuchet-ffc2682a9784e03d7cc9943f4f408255f8468b96.tar.bz2 android_packages_apps_Trebuchet-ffc2682a9784e03d7cc9943f4f408255f8468b96.zip | |
Fix NPE
Bug: 7441452
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index ffd63d28c..f0077a6af 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -1403,6 +1403,10 @@ public final class Launcher extends Activity Runnable processIntent = new Runnable() { public void run() { + if (mWorkspace == null) { + // Can be cases where mWorkspace is null, this prevents a NPE + return; + } Folder openFolder = mWorkspace.getOpenFolder(); // In all these cases, only animate if we're already on home mWorkspace.exitWidgetResizeMode(); |