diff options
| author | Ian Parkinson <ianp@google.com> | 2014-01-22 11:32:47 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-22 11:32:47 -0800 |
| commit | 4195da42b77e1f0bf69f2d36583cdd176ecc5288 (patch) | |
| tree | d12a425c5b5972929c310cde722da5cd080293e6 /src/com | |
| parent | f488644c2cbfa831aab1077e59458879cb7511a2 (diff) | |
| parent | 944491587e8a8f77233a1916cc16cd07edd97f2e (diff) | |
| download | android_packages_apps_Trebuchet-4195da42b77e1f0bf69f2d36583cdd176ecc5288.tar.gz android_packages_apps_Trebuchet-4195da42b77e1f0bf69f2d36583cdd176ecc5288.tar.bz2 android_packages_apps_Trebuchet-4195da42b77e1f0bf69f2d36583cdd176ecc5288.zip | |
am 94449158: Avoid NPE from delayed Runnable
* commit '944491587e8a8f77233a1916cc16cd07edd97f2e':
Avoid NPE from delayed Runnable
Diffstat (limited to 'src/com')
| -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 503cc6a01..709f4cf53 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -3952,9 +3952,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 { |