From 65a1de963a9b93225b67a399c9abc66d9bb8fd6f Mon Sep 17 00:00:00 2001
From: Adam Powell <adamp@google.com>
Date: Sun, 30 Jan 2011 15:47:29 -0800
Subject: [PATCH] Fix bug 3405899 -
 android.view.WindowManager$BadTokenException

Clear any pending runnables involved with TextViews when cursor
controllers are released

Change-Id: I96898fcc237f20d0b0f2351181244cb171fa2083
---
 core/java/android/widget/TextView.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 10ec6ca5899e1..6bcc844390955 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -7391,12 +7391,18 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
 
         if (!mInsertionControllerEnabled) {
             hideInsertionPointCursorController();
-            mInsertionPointCursorController = null;
+            if (mInsertionPointCursorController != null) {
+                mInsertionPointCursorController.onDetached();
+                mInsertionPointCursorController = null;
+            }
         }
 
         if (!mSelectionControllerEnabled) {
             stopSelectionActionMode();
-            mSelectionModifierCursorController = null;
+            if (mSelectionModifierCursorController != null) {
+                mSelectionModifierCursorController.onDetached();
+                mSelectionModifierCursorController = null;
+            }
         }
     }