OSDN Git Service

Avoid NPE from delayed Runnable
authorIan Parkinson <ianp@google.com>
Tue, 21 Jan 2014 13:09:59 +0000 (13:09 +0000)
committerIan Parkinson <ianp@google.com>
Tue, 21 Jan 2014 13:09:59 +0000 (13:09 +0000)
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

src/com/android/launcher3/Launcher.java

index 9a16037..50bbe51 100644 (file)
@@ -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 {