commit c75676f8db7fe3e2661e737709524186a8a96232
author Adam Powell <adamp@google.com> Sun Jan 30 16:17:59 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Sun Jan 30 16:17:59 2011 -0800
tree 4741133073357ac090254766f82958dd25fe2f19
parent 58468459dcf6001b32f4ecf4fffc2b0cc1ab6e05
parent 853f284c0b80540cf447af0e6e704d7a05947efd

am 853f284c: am c9cb3083: Merge "Fix bug 3405899 - android.view.WindowManager" into honeycomb

* commit '853f284c0b80540cf447af0e6e704d7a05947efd':
  Fix bug 3405899 - android.view.WindowManager$BadTokenException

core/java/android/widget/TextView.java

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index c4c4ae3..eee042a 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -7388,12 +7388,18 @@
 
         if (!mInsertionControllerEnabled) {
             hideInsertionPointCursorController();
-            mInsertionPointCursorController = null;
+            if (mInsertionPointCursorController != null) {
+                mInsertionPointCursorController.onDetached();
+                mInsertionPointCursorController = null;
+            }
         }
 
         if (!mSelectionControllerEnabled) {
             stopSelectionActionMode();
-            mSelectionModifierCursorController = null;
+            if (mSelectionModifierCursorController != null) {
+                mSelectionModifierCursorController.onDetached();
+                mSelectionModifierCursorController = null;
+            }
         }
     }