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

* commit 'c9cb30837116b138a91b251e5217a644231eebef':
  Fix bug 3405899 - android.view.WindowManager$BadTokenException
This commit is contained in:
Adam Powell
2011-01-30 16:14:54 -08:00
committed by Android Git Automerger

View File

@@ -7388,12 +7388,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;
}
}
}