From 2152ca58c256f4e7d8a5d895eb96cdc2d2580a05 Mon Sep 17 00:00:00 2001
From: Romain Guy <romainguy@google.com>
Date: Fri, 21 Jan 2011 12:31:53 -0800
Subject: [PATCH] Don't set a Toast's view to null when enqueued several times.
 Bug #3374386

Change-Id: I0fc6f96b37c8866ad1e890813054dafbaf2cc13e
---
 core/java/android/widget/Toast.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/java/android/widget/Toast.java b/core/java/android/widget/Toast.java
index 6a7db1f0b83cd..bb23173ae0034 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;
             }
         }
     }