1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/widget/Toast.java b/core/java/android/widget/Toast.java
index 6a7db1f0b83c..bb23173ae003 100644
--- a/core/java/android/widget/Toast.java
+++ b/core/java/android/widget/Toast.java
@@ -301,6 +301,8 @@ public class Toast {
         final Runnable mHide = new Runnable() {
             public void run() {
                 handleHide();
+                // Don't do this in handleHide() because it is also invoked by handleShow()
+                mNextView = null;
             }
         };
 
@@ -407,7 +409,6 @@ public class Toast {
                 }
 
                 mView = null;
-                mNextView = null;
             }
         }
     }