diff options
| author | Ian Parkinson <ianp@google.com> | 2014-01-21 13:09:59 +0000 |
|---|---|---|
| committer | Ian Parkinson <ianp@google.com> | 2014-01-21 13:09:59 +0000 |
| commit | 944491587e8a8f77233a1916cc16cd07edd97f2e (patch) | |
| tree | 7cb3154e742a043b2a80fb7fb6db386576b0ebc2 /src | |
| parent | a4db090b1345038a89a38ba8af6ac74f71e2ed7c (diff) | |
| download | android_packages_apps_Trebuchet-944491587e8a8f77233a1916cc16cd07edd97f2e.tar.gz android_packages_apps_Trebuchet-944491587e8a8f77233a1916cc16cd07edd97f2e.tar.bz2 android_packages_apps_Trebuchet-944491587e8a8f77233a1916cc16cd07edd97f2e.zip | |
Avoid NPE from delayed Runnable
Naive fix to b/12656485. Other Runnables in Launcher similarly check
that mWorkspace hasn't become null between being posted and being
executed, so I think this is probably appropriate.
Bug: 12656485
Change-Id: Ib4f3d0e8686c6249fe838144b1e8120c85f66f01
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 9a16037ae..50bbe51a5 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -3951,9 +3951,11 @@ public class Launcher extends Activity // when we are loading right after we return to launcher. mWorkspace.postDelayed(new Runnable() { public void run() { - mWorkspace.snapToPage(newScreenIndex); - mWorkspace.postDelayed(startBounceAnimRunnable, - NEW_APPS_ANIMATION_DELAY); + if (mWorkspace != null) { + mWorkspace.snapToPage(newScreenIndex); + mWorkspace.postDelayed(startBounceAnimRunnable, + NEW_APPS_ANIMATION_DELAY); + } } }, NEW_APPS_PAGE_MOVE_DELAY); } else { |